summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorRizzo Davide <davide@elpa.it>2008-02-04 23:44:48 -0800
committerDavid Woodhouse <dwmw2@infradead.org>2008-02-07 10:38:12 +0000
commit484b8e64c848185af0d3671fafba4dd66ca412d2 (patch)
tree99a2bdfd37288ab7f7e00311fa86cf771fe53e34 /drivers/mtd
parent53fb84a0695ffeeeadf8ae92db28cbccf5325531 (diff)
downloadop-kernel-dev-484b8e64c848185af0d3671fafba4dd66ca412d2.zip
op-kernel-dev-484b8e64c848185af0d3671fafba4dd66ca412d2.tar.gz
[MTD] [NOR] fix startup lock when using multiple nor flash chips
Taken from http://bugzilla.kernel.org/show_bug.cgi?id=9829 I found and solved the problem, at line 115 of drivers/mtd/chips/gen_probe.c (kernel 2.6.24): mapsize value must be calculated in bytes, not in long. Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/chips/gen_probe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/chips/gen_probe.c b/drivers/mtd/chips/gen_probe.c
index 2eb696d..d338b8c 100644
--- a/drivers/mtd/chips/gen_probe.c
+++ b/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);
OpenPOWER on IntegriCloud