git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap1
/
mcbsp.c
diff --git
a/arch/arm/mach-omap1/mcbsp.c
b/arch/arm/mach-omap1/mcbsp.c
index 8ed67f8d1762f3bc5937e46c0519b816d135cddf..27e22e702f96a9e09a87366cd6a695c7bbd46023 100644
(file)
--- a/
arch/arm/mach-omap1/mcbsp.c
+++ b/
arch/arm/mach-omap1/mcbsp.c
@@
-389,7
+389,7
@@
static void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,
{
int i;
- omap_mcbsp_devices = k
zalloc(size *
sizeof(struct platform_device *),
+ omap_mcbsp_devices = k
calloc(size,
sizeof(struct platform_device *),
GFP_KERNEL);
if (!omap_mcbsp_devices) {
printk(KERN_ERR "Could not register McBSP devices\n");