projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
[linux-2.6-block.git]
/
drivers
/
macintosh
/
macio_asic.c
diff --git
a/drivers/macintosh/macio_asic.c
b/drivers/macintosh/macio_asic.c
index c96b7fe882a450ccfaae4d9fe8c6d0c084077876..ec9e5f32f0ae3d3cf9c2ecc1cc34ce35d8a183d9 100644
(file)
--- a/
drivers/macintosh/macio_asic.c
+++ b/
drivers/macintosh/macio_asic.c
@@
-365,10
+365,9
@@
static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
if (np == NULL)
return NULL;
- dev = k
m
alloc(sizeof(*dev), GFP_KERNEL);
+ dev = k
z
alloc(sizeof(*dev), GFP_KERNEL);
if (!dev)
return NULL;
- memset(dev, 0, sizeof(*dev));
dev->bus = &chip->lbus;
dev->media_bay = in_bay;