commit 987482c5d24528d6fb7e6279c0177612ca91b75c
author Marek Behún <marek.behun@nic.cz> Tue Oct 05 15:56:00 2021 +0200
committer Jagan Teki <jagan@amarulasolutions.com> Sat Oct 23 15:47:33 2021 +0530
tree 74943a09c7087d1092d4b33e02c80a133bb3ad60
parent d929a6ff68b415b503a6eef51b13b2487155fdba

mtd: spi-nor-core: Check return value of write_disable() in spi_nor_erase()

The cleanup code of spi_nor_erase() function calls write_disable(), but
does not return it's return value even in case of failure. Fix this.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Masami Hiramatsu <masami.hiramatsu@linaro.org>

drivers/mtd/spi/spi-nor-core.c

diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index d8eed59..30c54cd 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -953,7 +953,9 @@
 	if (!ret)
 		ret = err;
 #endif
-	write_disable(nor);
+	err = write_disable(nor);
+	if (!ret)
+		ret = err;
 
 	return ret;
 }