summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-11-26 10:23:35 +0000
committerDavid Woodhouse <David.Woodhouse@intel.com>2008-11-26 10:23:35 +0000
commit9168ab861ae3eb8942da61d884a5c1980ba98a5f (patch)
treece15921d01257ffbc860468a0ba2a191aadc3af4
parenta3d3f73ccbd68b3557c4aaf9f6246ea21d922835 (diff)
[MTD] m25p80: fix detection of m25p16 flashes
Commit d0e8c47c58575b9131e786edb488fd029eba443e ("m25p80.c extended jedec support") added support for extended ids but seems to break on flashes which don't have an extended id defined. If the table does not have an extid defined, then we should ignore it. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Michael Hennerich <Michael.Hennerich@analog.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--drivers/mtd/devices/m25p80.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index a298fed6ab0c..6188fd4ddcc0 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -575,7 +575,7 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi)
tmp < ARRAY_SIZE(m25p_data);
tmp++, info++) {
if (info->jedec_id == jedec) {
- if (ext_jedec != 0 && info->ext_id != ext_jedec)
+ if (info->ext_id != 0 && info->ext_id != ext_jedec)
continue;
return info;
}