Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 484b8e64 authored by Rizzo Davide's avatar Rizzo Davide Committed by David Woodhouse
Browse files

[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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 53fb84a0

drivers/mtd/chips/gen_probe.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -112,7 +112,7 @@ static struct cfi_private *genprobe_ident_chips(struct map_info *map, struct chi 
		max_chips = 1;

		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);

	chip_map = kzalloc(mapsize, GFP_KERNEL);

	if (!chip_map) {

	if (!chip_map) {

		printk(KERN_WARNING "%s: kmalloc failed for CFI chip map\n", map->name);

		printk(KERN_WARNING "%s: kmalloc failed for CFI chip map\n", map->name);