diff options
| author | Boris Brezillon <boris.brezillon@collabora.com> | 2020-05-01 16:39:13 +0200 |
|---|---|---|
| committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2020-05-11 09:51:43 +0200 |
| commit | a50b0c20bedcf10599708bed1608209274899053 (patch) | |
| tree | 19aba6ae164c080f116e4f8e62c3bc8c05df4504 /drivers/mtd/nand/raw/diskonchip.c | |
| parent | mtd: rawnand: diskonchip: Set the NAND_NO_BBM_QUIRK flag (diff) | |
| download | linux-a50b0c20bedcf10599708bed1608209274899053.tar.xz linux-a50b0c20bedcf10599708bed1608209274899053.zip | |
mtd: rawnand: diskonchip: Make sure doc2001plus_readbuf() works for single byte reads
Single byte accesses normally go through read_byte() but we are about
to use this function in the exec_op() implementation and thus needs to
prepare for single byte reads.
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20200501143917.1388957-2-boris.brezillon@collabora.com
Diffstat (limited to 'drivers/mtd/nand/raw/diskonchip.c')
| -rw-r--r-- | drivers/mtd/nand/raw/diskonchip.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/mtd/nand/raw/diskonchip.c b/drivers/mtd/nand/raw/diskonchip.c index 4c3d04da4cee..ab5a36671e72 100644 --- a/drivers/mtd/nand/raw/diskonchip.c +++ b/drivers/mtd/nand/raw/diskonchip.c @@ -550,9 +550,12 @@ static void doc2001plus_readbuf(struct nand_chip *this, u_char *buf, int len) } /* Terminate read pipeline */ - buf[len - 2] = ReadDOC(docptr, Mplus_LastDataRead); - if (debug && i < 16) - printk("%02x ", buf[len - 2]); + if (len >= 2) { + buf[len - 2] = ReadDOC(docptr, Mplus_LastDataRead); + if (debug && i < 16) + printk("%02x ", buf[len - 2]); + } + buf[len - 1] = ReadDOC(docptr, Mplus_LastDataRead); if (debug && i < 16) printk("%02x ", buf[len - 1]); |