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 tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
[linux-2.6-block.git]
/
drivers
/
mfd
/
mfd-core.c
diff --git
a/drivers/mfd/mfd-core.c
b/drivers/mfd/mfd-core.c
index c57e407020f11dd19aff3a9dd4b9ba7ce9c7b351..94e3f32ce935717e97f2e938b433f3673c38f22d 100644
(file)
--- a/
drivers/mfd/mfd-core.c
+++ b/
drivers/mfd/mfd-core.c
@@
-158,7
+158,7
@@
static int mfd_add_device(struct device *parent, int id,
if (!pdev)
goto fail_alloc;
- res = k
zalloc(sizeof(*res) * cell->num_resources
, GFP_KERNEL);
+ res = k
calloc(cell->num_resources, sizeof(*res)
, GFP_KERNEL);
if (!res)
goto fail_device;