[MTD] m25p80: fix detection of m25p16 flashes

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=9168ab861ae3eb8942da61d884a5c1980ba98a5f
Commit:     9168ab861ae3eb8942da61d884a5c1980ba98a5f
Parent:     a3d3f73ccbd68b3557c4aaf9f6246ea21d922835
Author:     Mike Frysinger <vapier at gentoo.org>
AuthorDate: Wed Nov 26 10:23:35 2008 +0000
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Wed Nov 26 10:23:35 2008 +0000

    [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 at gentoo.org>
    Signed-off-by: Michael Hennerich <Michael.Hennerich at analog.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/devices/m25p80.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index a298fed..6188fd4 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;
 		}