summaryrefslogtreecommitdiff
path: root/drivers/mtd
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-11-26 10:23:25 +0000
committerDavid Woodhouse <David.Woodhouse@intel.com>2008-11-26 10:23:25 +0000
commita3d3f73ccbd68b3557c4aaf9f6246ea21d922835 (patch)
tree543156321f1af28c8ca514ccc2ea02fa3c0f7219 /drivers/mtd
parentcbbd695687caab1082a70d2ae81153fdba7e851c (diff)
downloadlinux-3.10-a3d3f73ccbd68b3557c4aaf9f6246ea21d922835.tar.gz
linux-3.10-a3d3f73ccbd68b3557c4aaf9f6246ea21d922835.tar.bz2
linux-3.10-a3d3f73ccbd68b3557c4aaf9f6246ea21d922835.zip
[MTD] m25p80: fix detection of SPI parts
Commit d0e8c47c58575b9131e786edb488fd029eba443e ("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>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/devices/m25p80.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 76a76751da3..a298fed6ab0 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -574,10 +574,11 @@ 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;