spi: rp2040-gpio-bridge: fix gpiod error handling

roliver-rpi · popcornmix · commit 0683c97fca5d · 2025-03-03T16:05:50.000Z
In some circumstances, devm_gpiod_get_array_optional() can return
PTR_ERR rather than NULL to indicate failure. Handle these cases.

Signed-off-by: Richard Oliver &lt;richard.oliver@raspberrypi.com&gt;
diff --git a/drivers/spi/spi-rp2040-gpio-bridge.c b/drivers/spi/spi-rp2040-gpio-bridge.c
@@ -956,7 +956,8 @@ static void rp2040_gbdg_parse_dt(struct rp2040_gbdg *rp2040_gbdg)
 
 	rp2040_gbdg->fast_xfer_gpios =
 		devm_gpiod_get_array_optional(dev, "fast_xfer", GPIOD_ASIS);
-	if (!rp2040_gbdg->fast_xfer_gpios) {
+	if (IS_ERR_OR_NULL(rp2040_gbdg->fast_xfer_gpios)) {
+		rp2040_gbdg->fast_xfer_gpios = NULL;
 		dev_info(dev, "Could not acquire fast_xfer-gpios\n");
 		goto node_put;
 	}

Original file line number	Diff line number	Diff line change
`@@ -956,7 +956,8 @@ static void rp2040_gbdg_parse_dt(struct rp2040_gbdg *rp2040_gbdg)`
`956`	`956`
`957`	`957`	`rp2040_gbdg->fast_xfer_gpios =`
`958`	`958`	`devm_gpiod_get_array_optional(dev, "fast_xfer", GPIOD_ASIS);`
`959`		`- if (!rp2040_gbdg->fast_xfer_gpios) {`
	`959`	`+ if (IS_ERR_OR_NULL(rp2040_gbdg->fast_xfer_gpios)) {`
	`960`	`+ rp2040_gbdg->fast_xfer_gpios = NULL;`
`960`	`961`	`dev_info(dev, "Could not acquire fast_xfer-gpios\n");`
`961`	`962`	`goto node_put;`
`962`	`963`	`}`