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 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
hsmmc.c
diff --git
a/arch/arm/mach-omap2/hsmmc.c
b/arch/arm/mach-omap2/hsmmc.c
index 0103548b0b155c0587e05cf998808b4c09df473c..af545193f6736f474d2c77b62c3abc46fc7c494f 100644
(file)
--- a/
arch/arm/mach-omap2/hsmmc.c
+++ b/
arch/arm/mach-omap2/hsmmc.c
@@
-34,7
+34,7
@@
static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
{
char *hc_name;
- hc_name = kzalloc(
sizeof(char) * (HSMMC_NAME_LEN + 1)
, GFP_KERNEL);
+ hc_name = kzalloc(
HSMMC_NAME_LEN + 1
, GFP_KERNEL);
if (!hc_name) {
kfree(hc_name);
return -ENOMEM;