diff mbox series

mtd: rawnand: brcmnand: fix status read of brcmnand_waitfunc

Message ID 20241126023916.197635-1-dregan@broadcom.com
State Accepted
Headers show
Series mtd: rawnand: brcmnand: fix status read of brcmnand_waitfunc | expand

Commit Message

david regan Nov. 26, 2024, 2:39 a.m. UTC 
This change fixes an issue where an error return value may be mistakenly
used as NAND status.

Fixes: f504551b7f15 ("mtd: rawnand: Propagate error and simplify ternary operators for brcmstb_nand_wait_for_completion()")
Signed-off-by: david regan <dregan@broadcom.com>
Reviewed-by: William Zhang <william.zhang@broadcom.com>
---
 drivers/mtd/nand/raw/brcmnand/brcmnand.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Miquel Raynal Dec. 24, 2024, 12:40 p.m. UTC | #1 
On Mon, 25 Nov 2024 18:39:16 -0800, david regan wrote:
> This change fixes an issue where an error return value may be mistakenly
> used as NAND status.
> 
> 

Applied to nand/next, thanks!

[1/1] mtd: rawnand: brcmnand: fix status read of brcmnand_waitfunc
      commit: 03271ea36ea7a58d30a4bde182eb2a0d46220467

Patche(s) will be available within hours on:
mtd/linux.git

Kind regards,
Miquèl
diff mbox series

Patch

diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index 482c6f093f99..701aa19328ad 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -1893,6 +1893,11 @@  static int brcmnand_write(struct mtd_info *mtd, struct nand_chip *chip,
 		brcmnand_send_cmd(host, CMD_PROGRAM_PAGE);
 		status = brcmnand_waitfunc(chip);
 
+		if (status < 0) {
+			ret = status;
+			goto out;
+		}
+
 		if (status & NAND_STATUS_FAIL) {
 			dev_info(ctrl->dev, "program failed at %llx\n",
 				(unsigned long long)addr);