[MTD] m25p80: fix detection of SPI parts
Commit d0e8c47c58
("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@gentoo.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
parent
cbbd695687
commit
a3d3f73ccb
|
@ -574,11 +574,12 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi)
|
||||||
for (tmp = 0, info = m25p_data;
|
for (tmp = 0, info = m25p_data;
|
||||||
tmp < ARRAY_SIZE(m25p_data);
|
tmp < ARRAY_SIZE(m25p_data);
|
||||||
tmp++, info++) {
|
tmp++, info++) {
|
||||||
if (info->jedec_id == jedec)
|
if (info->jedec_id == jedec) {
|
||||||
if (ext_jedec != 0 && info->ext_id != ext_jedec)
|
if (ext_jedec != 0 && info->ext_id != ext_jedec)
|
||||||
continue;
|
continue;
|
||||||
return info;
|
return info;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
dev_err(&spi->dev, "unrecognized JEDEC id %06x\n", jedec);
|
dev_err(&spi->dev, "unrecognized JEDEC id %06x\n", jedec);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue