From: Takahiro Kuwano <Takahiro.Kuwano@infineon.com>
Date: Mon, 28 Jul 2025 01:13:58 +0000 (+0900)
Subject: mtd: spi-nor: Fix return value of s25_s28_mdp_ready()
X-Git-Tag: v2025.10-rc2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0526d44daebeb39d058d8b274370c3070457727;p=thirdparty%2Fu-boot.git

mtd: spi-nor: Fix return value of s25_s28_mdp_ready()

s25_s28_mdp_ready() returns 1 when spansion_sr_ready() returns negative
value (error code). Fix this problem by following Linux implementation.

Fixes: 1c3dd193b5b ("mtd: spi-nor-core: Add fixups for Cypress s25hl-t/s25hs-t")
Reported-by: Hiroyuki Saito <Hiroyuki.Saito2@infineon.com>
Signed-off-by: Takahiro Kuwano <Takahiro.Kuwano@infineon.com>
Reviewed-by: Tudor Ambarus <tudor.ambarus@linaro.org>
---

diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index 655bf3aaf81..76c33b24368 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -3784,8 +3784,10 @@ static int s25_s28_mdp_ready(struct spi_nor *nor)
 
 	for (addr = 0; addr < nor->mtd.size; addr += SZ_128M) {
 		ret = spansion_sr_ready(nor, addr, nor->rdsr_dummy);
-		if (!ret)
+		if (ret < 0)
 			return ret;
+		else if (ret == 0)
+			return 0;
 	}
 
 	return 1;