]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[MTD] m25p80.c extended jedec support (v2)
authorChen Gong <g.chen@freescale.com>
Tue, 16 Sep 2008 06:14:12 +0000 (14:14 +0800)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Tue, 14 Oct 2008 09:59:43 +0000 (10:59 +0100)
Include missing parts of previous patch.

Signed-off-by: Chen Gong <g.chen@freescale.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
drivers/mtd/devices/m25p80.c

index 4d3ae085b1d256c842fd26447a57b5948a8ba2f7..697a3a217837df166585ce1c7a6e9fb69a3655e4 100644 (file)
@@ -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);