aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChen Gong <g.chen@freescale.com>2008-09-16 02:14:12 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2008-10-14 05:59:43 -0400
commitdaa847356a4f2b2722d78b389ec4f172f24fecd5 (patch)
treee30bd29f5d3ed7dd123b84bdb53d02ce7699a53c /drivers
parent69fd3a8d098faf41a04930afa83757c0555ee360 (diff)
[MTD] m25p80.c extended jedec support (v2)
Include missing parts of previous patch. Signed-off-by: Chen Gong <g.chen@freescale.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/devices/m25p80.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 4d3ae085b1d2..697a3a217837 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -548,7 +548,7 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi)
548{ 548{
549 int tmp; 549 int tmp;
550 u8 code = OPCODE_RDID; 550 u8 code = OPCODE_RDID;
551 u8 id[3]; 551 u8 id[5];
552 u32 jedec; 552 u32 jedec;
553 u16 ext_jedec; 553 u16 ext_jedec;
554 struct flash_info *info; 554 struct flash_info *info;
@@ -557,7 +557,7 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi)
557 * string for after vendor-specific data, after the three bytes 557 * string for after vendor-specific data, after the three bytes
558 * we use here. Supporting some chips might require using it. 558 * we use here. Supporting some chips might require using it.
559 */ 559 */
560 tmp = spi_write_then_read(spi, &code, 1, id, 3); 560 tmp = spi_write_then_read(spi, &code, 1, id, 5);
561 if (tmp < 0) { 561 if (tmp < 0) {
562 DEBUG(MTD_DEBUG_LEVEL0, "%s: error %d reading JEDEC ID\n", 562 DEBUG(MTD_DEBUG_LEVEL0, "%s: error %d reading JEDEC ID\n",
563 spi->dev.bus_id, tmp); 563 spi->dev.bus_id, tmp);