[MTD] m25p80: fix detection of m25p16 flashes
authorMike Frysinger <vapier@gentoo.org>
Wed, 26 Nov 2008 10:23:35 +0000 (10:23 +0000)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 26 Nov 2008 10:23:35 +0000 (10:23 +0000)
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>
drivers/mtd/devices/m25p80.c

index a298fed6ab0c04e5bc8c281cb1232f37cb2cbeb4..6188fd4ddcc0bdaef304f9e0cdea75417086ad09 100644 (file)
@@ -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;
                }