[MTD] m25p80: fix detection of SPI parts

[Linux-MTD Mailing List]

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

    [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 at gentoo.org>
    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 |    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;