summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/atmel
diff options
context:
space:
mode:
authorBoris Brezillon <boris.brezillon@free-electrons.com>2017-05-16 18:27:49 +0200
committerBoris Brezillon <boris.brezillon@free-electrons.com>2017-06-01 10:09:33 +0200
commit41145649f4acb30249b636b945053db50c9331c5 (patch)
tree0d1a10e2aae6967ac3401f2217f3f5e8019985dd /drivers/mtd/nand/atmel
parenta186493237a9d8559997c2f97c33c4716d602fd2 (diff)
downloadop-kernel-dev-41145649f4acb30249b636b945053db50c9331c5.zip
op-kernel-dev-41145649f4acb30249b636b945053db50c9331c5.tar.gz
mtd: nand: Wait for PAGEPROG to finish in drivers setting NAND_ECC_CUSTOM_PAGE_ACCESS
Drivers setting NAND_ECC_CUSTOM_PAGE_ACCESS are supposed to handle the full read/write page sequence, and waiting for a page to actually be programmed is part of this write-page sequence. This is also what is done in ->write_oob_xxx() hooks, so let's do that in ->write_page_xxx() as well to make it consistent. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Diffstat (limited to 'drivers/mtd/nand/atmel')
-rw-r--r--drivers/mtd/nand/atmel/nand-controller.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mtd/nand/atmel/nand-controller.c b/drivers/mtd/nand/atmel/nand-controller.c
index 846c555..6055831 100644
--- a/drivers/mtd/nand/atmel/nand-controller.c
+++ b/drivers/mtd/nand/atmel/nand-controller.c
@@ -917,7 +917,7 @@ static int atmel_hsmc_nand_pmecc_write_pg(struct nand_chip *chip,
struct mtd_info *mtd = nand_to_mtd(chip);
struct atmel_nand *nand = to_atmel_nand(chip);
struct atmel_hsmc_nand_controller *nc;
- int ret;
+ int ret, status;
nc = to_hsmc_nand_controller(chip->controller);
@@ -959,6 +959,10 @@ static int atmel_hsmc_nand_pmecc_write_pg(struct nand_chip *chip,
dev_err(nc->base.dev, "Failed to program NAND page (err = %d)\n",
ret);
+ status = chip->waitfunc(mtd, chip);
+ if (status & NAND_STATUS_FAIL)
+ return -EIO;
+
return ret;
}
OpenPOWER on IntegriCloud