[PATCH] m25p80: fix detection of SPI parts

[PATCH] m25p80: fix detection of SPI parts

[Mike Frysinger]

Commit d0e8c47c58575b9131e786edb488fd029eba443e 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>
---
 drivers/mtd/devices/m25p80.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 76a7675..a298fed 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;
-- 
1.6.0.2

[PATCH] m25p80: fix detection of m25p16 flashes

[Mike Frysinger]

Commit d0e8c47c58575b9131e786edb488fd029eba443e 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>
---
 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;
 		}
-- 
1.6.0.2

Re: [PATCH] m25p80: fix detection of m25p16 flashes

[Andrew Morton]

On Thu, 30 Oct 2008 15:59:46 -0400
Mike Frysinger <vapier@gentoo.org> wrote:

> Commit d0e8c47c58575b9131e786edb488fd029eba443e added support for extended ids

Quoting a bare hash in the changelog is a bit reader-hostile and I
believe there's some git-related issue which can cause people to not be
able to find the commit at all (I'm not sure what the circumstances
are, but Linus has mentioned it a couple of times when asking people to
not quote bare commit IDs in changelogs).

So when referencing a previous commit please use this form:

   Commit d0e8c47c58575b9131e786edb488fd029eba443e ("m25p80.c
   extended jedec support").

Thanks.