aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/devices/m25p80.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 76a76751da36..a298fed6ab0c 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)
574 for (tmp = 0, info = m25p_data; 574 for (tmp = 0, info = m25p_data;
575 tmp < ARRAY_SIZE(m25p_data); 575 tmp < ARRAY_SIZE(m25p_data);
576 tmp++, info++) { 576 tmp++, info++) {
577 if (info->jedec_id == jedec) 577 if (info->jedec_id == jedec) {
578 if (ext_jedec != 0 && info->ext_id != ext_jedec) 578 if (ext_jedec != 0 && info->ext_id != ext_jedec)
579 continue; 579 continue;
580 return info; 580 return info;
581 }
581 } 582 }
582 dev_err(&spi->dev, "unrecognized JEDEC id %06x\n", jedec); 583 dev_err(&spi->dev, "unrecognized JEDEC id %06x\n", jedec);
583 return NULL; 584 return NULL;