Commit a3d3f73c authored Nov 26, 2008 by Mike Frysinger Committed by David Woodhouse Nov 26, 2008

[MTD] m25p80: fix detection of SPI parts



Commit d0e8c47c ("m25p80.c extended jedec
support") added support for extended ids but in the process managed to
break detection of all flashes.

The ext jedec id check was inserted into an if statement that lacked
braces, and it did not add the required braces.  As such, the detection
routine always returns the first entry in the SPI flash list.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

parent cbbd6956

drivers/mtd/devices/m25p80.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -574,11 +574,12 @@ static struct flash_info __devinit jedec_probe(struct spi_device spi)
		for (tmp = 0, info = m25p_data;
		tmp < ARRAY_SIZE(m25p_data);
		tmp++, info++) {
		if (info->jedec_id == jedec)
		if (info->jedec_id == jedec) {
		if (ext_jedec != 0 && info->ext_id != ext_jedec)
		continue;
		return info;
		}
		}
		dev_err(&spi->dev, "unrecognized JEDEC id %06x\n", jedec);
		return NULL;
		}