From: Gabor Juhos Date: Tue, 30 Sep 2025 00:21:04 +0000 (+0300) Subject: mtd: spinand: propagate spinand_wait() errors from spinand_write_page() X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f61362c24f5d827005cca5b46887400625faf540;p=thirdparty%2Fu-boot.git mtd: spinand: propagate spinand_wait() errors from spinand_write_page() Since commit 3d1f08b032dc ("mtd: spinand: Use the external ECC engine logic") the spinand_write_page() function ignores the errors returned by spinand_wait(). Change the code to propagate those up to the stack as it was done before the offending change. This is a port of linux commit 091d9e35b85b ("mtd: spinand: propagate spinand_wait() errors from spinand_write_page()") Signed-off-by: Gabor Juhos Signed-off-by: Miquel Raynal Signed-off-by: Mikhail Kshevetskiy # U-Boot port Signed-off-by: Michael Trimarchi --- diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c index daf6efb87d8..3e21a06dd0f 100644 --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c @@ -691,7 +691,10 @@ int spinand_write_page(struct spinand_device *spinand, SPINAND_WRITE_INITIAL_DELAY_US, SPINAND_WRITE_POLL_DELAY_US, &status); - if (!ret && (status & STATUS_PROG_FAILED)) + if (ret) + return ret; + + if (status & STATUS_PROG_FAILED) return -EIO; return spinand_ondie_ecc_finish_io_req(nand, (struct nand_page_io_req *)req);