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

Commit 6170b434 authored by Russell King's avatar Russell King Committed by Thomas Gleixner
Browse files

[MTD] Fix MTD device probing 



Try larger numbers of chips before smaller
numbers of chips across the bus width.

This means we'll avoid misdetecting a 2 x16 array as 1 x32 if the
high 16-bits happen to read as zeros in the QRY area.

Signed-off-by: default avatarRussell King <linux@arm.linux.org.uk>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 3118db3d

drivers/mtd/chips/gen_probe.c

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * Routines common to all CFI-type probes.

 * (C) 2001-2003 Red Hat, Inc.

 * GPL'd

 * $Id: gen_probe.c,v 1.21 2004/08/14 15:14:05 dwmw2 Exp $

 * $Id: gen_probe.c,v 1.22 2005/01/24 23:49:50 rmk Exp $

 */



#include <linux/kernel.h>
@@ -162,7 +162,7 @@ static int genprobe_new_chip(struct map_info *map, struct chip_probe *cp, 
	int max_chips = map_bankwidth(map); /* And minimum 1 */

	int nr_chips, type;



	for (nr_chips = min_chips; nr_chips <= max_chips; nr_chips <<= 1) {

	for (nr_chips = max_chips; nr_chips >= min_chips; nr_chips >>= 1) {



		if (!cfi_interleave_supported(nr_chips))

		    continue;