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 'work.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-vexpress
/
spc.c
diff --git
a/arch/arm/mach-vexpress/spc.c
b/arch/arm/mach-vexpress/spc.c
index 21c064267af5a4f95df0052a944b0ebf0490215d..0f5381d1349418c5de2723be59811be30a402f8e 100644
(file)
--- a/
arch/arm/mach-vexpress/spc.c
+++ b/
arch/arm/mach-vexpress/spc.c
@@
-403,7
+403,7
@@
static int ve_spc_populate_opps(uint32_t cluster)
uint32_t data = 0, off, ret, idx;
struct ve_spc_opp *opps;
- opps = k
zalloc(sizeof(*opps) * MAX_OPPS
, GFP_KERNEL);
+ opps = k
calloc(MAX_OPPS, sizeof(*opps)
, GFP_KERNEL);
if (!opps)
return -ENOMEM;