summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Brezillon2018-07-18 10:28:14 +0200
committerMiquel Raynal2018-07-19 23:14:14 +0200
commit79e1ca37cc0c056f224cc1dd4a301b9dc2f94167 (patch)
tree752049ded32d5c5ae2964287fd44ce73679915f4
parentmtd: rawnand: qcom: stop using phys_to_dma() (diff)
downloadkernel-qcow2-linux-79e1ca37cc0c056f224cc1dd4a301b9dc2f94167.tar.gz
kernel-qcow2-linux-79e1ca37cc0c056f224cc1dd4a301b9dc2f94167.tar.xz
kernel-qcow2-linux-79e1ca37cc0c056f224cc1dd4a301b9dc2f94167.zip
mtd: rawnand: fsmc: Stop using chip->read_buf()
chip->read_buf is left unassigned since commit 4da712e70294 ("mtd: nand: fsmc: use ->exec_op()"), leading to a NULL pointer dereference when it's called from fsmc_read_page_hwecc(). Fix that by using the appropriate helper to read data out of the NAND. Fixes: 4da712e70294 ("mtd: nand: fsmc: use ->exec_op()") Cc: <stable@vger.kernel.org> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
-rw-r--r--drivers/mtd/nand/raw/fsmc_nand.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c
index 527bebc7e6c9..59524d181bfe 100644
--- a/drivers/mtd/nand/raw/fsmc_nand.c
+++ b/drivers/mtd/nand/raw/fsmc_nand.c
@@ -741,7 +741,7 @@ static int fsmc_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
for (i = 0, s = 0; s < eccsteps; s++, i += eccbytes, p += eccsize) {
nand_read_page_op(chip, page, s * eccsize, NULL, 0);
chip->ecc.hwctl(mtd, NAND_ECC_READ);
- chip->read_buf(mtd, p, eccsize);
+ nand_read_data_op(chip, p, eccsize, false);
for (j = 0; j < eccbytes;) {
struct mtd_oob_region oobregion;