From: Andrew Goodbody <andrew.goodbody@linaro.org>
Date: Mon, 6 Oct 2025 15:09:25 +0000 (+0100)
Subject: spi: spi-uclass: Use unwind goto
X-Git-Tag: v2026.01-rc2~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f12ca3e2b81beef901c182981bb70b0b2aec8f6c;p=thirdparty%2Fu-boot.git

spi: spi-uclass: Use unwind goto

In _spi_get_bus_and_cs the check for stacked parallel support needing
multiple chip select support does a direct return on error. Instead it
should set the error code in ret and then use the unwind goto.

This issue was found by Smatch.

Signed-off-by: Andrew Goodbody <andrew.goodbody@linaro.org>
---

diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c
index d6049753740..49b584c648d 100644
--- a/drivers/spi/spi-uclass.c
+++ b/drivers/spi/spi-uclass.c
@@ -449,7 +449,8 @@ int _spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
 #if CONFIG_IS_ENABLED(SPI_STACKED_PARALLEL)
 	if ((dev_read_bool(dev, "parallel-memories")) && !slave->multi_cs_cap) {
 		dev_err(dev, "controller doesn't support multi CS\n");
-		return -EINVAL;
+		ret = -EINVAL;
+		goto err;
 	}
 #endif
 	/*