From: Jonas Gorski <jonas.gorski@gmail.com>
Date: Mon, 15 Sep 2025 18:37:19 +0000 (+0200)
Subject: spi: fix return code when spi device has too many chipselects
X-Git-Tag: v6.18-rc1~165^2~2^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=188f63235bcdd207646773a8739387d85347ed76;p=thirdparty%2Flinux.git

spi: fix return code when spi device has too many chipselects

Don't return a positive value when there are too many chipselects.

Fixes: 4d8ff6b0991d ("spi: Add multi-cs memories support in SPI core")
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: https://patch.msgid.link/20250915183725.219473-2-jonas.gorski@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index f95c4304df8e9..b07d6cdf587ce 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -2445,7 +2445,7 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi,
 	if (rc > ctlr->num_chipselect) {
 		dev_err(&ctlr->dev, "%pOF has number of CS > ctlr->num_chipselect (%d)\n",
 			nc, rc);
-		return rc;
+		return -EINVAL;
 	}
 	if ((of_property_present(nc, "parallel-memories")) &&
 	    (!(ctlr->flags & SPI_CONTROLLER_MULTI_CS))) {