From: Chen Gong Date: Tue, 16 Sep 2008 06:14:12 +0000 (+0800) Subject: [MTD] m25p80.c extended jedec support (v2) X-Git-Tag: v2.6.28-rc1~105^2~17 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=daa847356a4f2b2722d78b389ec4f172f24fecd5;p=linux-2.6-omap-h63xx.git [MTD] m25p80.c extended jedec support (v2) Include missing parts of previous patch. Signed-off-by: Chen Gong Signed-off-by: David Woodhouse --- diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 4d3ae085b1d..697a3a21783 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) { int tmp; u8 code = OPCODE_RDID; - u8 id[3]; + u8 id[5]; u32 jedec; u16 ext_jedec; struct flash_info *info; @@ -557,7 +557,7 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi) * string for after vendor-specific data, after the three bytes * we use here. Supporting some chips might require using it. */ - tmp = spi_write_then_read(spi, &code, 1, id, 3); + tmp = spi_write_then_read(spi, &code, 1, id, 5); if (tmp < 0) { DEBUG(MTD_DEBUG_LEVEL0, "%s: error %d reading JEDEC ID\n", spi->dev.bus_id, tmp);