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

KanjiMonster · broonie · commit 188f63235bcd · 2025-09-22T09:29:40.000+01:00
Don't return a positive value when there are too many chipselects. Fixes: 4d8ff6b ("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
@@ -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))) {

Original file line number	Diff line number	Diff line change
`@@ -2445,7 +2445,7 @@ static int of_spi_parse_dt(struct spi_controller ctlr, struct spi_device spi,`
`2445`	`2445`	`if (rc > ctlr->num_chipselect) {`
`2446`	`2446`	`dev_err(&ctlr->dev, "%pOF has number of CS > ctlr->num_chipselect (%d)\n",`
`2447`	`2447`	`nc, rc);`
`2448`		`- return rc;`
	`2448`	`+ return -EINVAL;`
`2449`	`2449`	`}`
`2450`	`2450`	`if ((of_property_present(nc, "parallel-memories")) &&`
`2451`	`2451`	`(!(ctlr->flags & SPI_CONTROLLER_MULTI_CS))) {`