From 6da1d88c56d0fa11c5bc1aa7e031898a621945c4 Mon Sep 17 00:00:00 2001 From: Rizzo Davide Date: Mon, 4 Feb 2008 23:44:48 -0800 Subject: [PATCH] --- yaml --- r: 84308 b: refs/heads/master c: 484b8e64c848185af0d3671fafba4dd66ca412d2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/chips/gen_probe.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d99a1ebae72c..c9a98d3632a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53fb84a0695ffeeeadf8ae92db28cbccf5325531 +refs/heads/master: 484b8e64c848185af0d3671fafba4dd66ca412d2 diff --git a/trunk/drivers/mtd/chips/gen_probe.c b/trunk/drivers/mtd/chips/gen_probe.c index 2eb696d7b97b..d338b8c92780 100644 --- a/trunk/drivers/mtd/chips/gen_probe.c +++ b/trunk/drivers/mtd/chips/gen_probe.c @@ -112,7 +112,7 @@ static struct cfi_private *genprobe_ident_chips(struct map_info *map, struct chi max_chips = 1; } - mapsize = (max_chips + BITS_PER_LONG-1) / BITS_PER_LONG; + mapsize = sizeof(long) * ( (max_chips + BITS_PER_LONG-1) / BITS_PER_LONG ); chip_map = kzalloc(mapsize, GFP_KERNEL); if (!chip_map) { printk(KERN_WARNING "%s: kmalloc failed for CFI chip map\n", map->name);