| From 356a40283a5bbcc5738f3319102f09a463086d0c Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Wed, 3 Apr 2019 16:46:56 +0200 |
| Subject: spi: Add missing error handling for CS GPIOs |
| |
| [ Upstream commit 1723fdec5fcbc4de3d26bbb23a9e1704ee258955 ] |
| |
| While devm_gpiod_get_index_optional() returns NULL if the GPIO is not |
| present (i.e. -ENOENT), it may still return other error codes, like |
| -EPROBE_DEFER. Currently these are not handled, leading to |
| unrecoverable failures later in case of probe deferral: |
| |
| gpiod_set_consumer_name: invalid GPIO (errorpointer) |
| gpiod_direction_output: invalid GPIO (errorpointer) |
| gpiod_set_value_cansleep: invalid GPIO (errorpointer) |
| gpiod_set_value_cansleep: invalid GPIO (errorpointer) |
| gpiod_set_value_cansleep: invalid GPIO (errorpointer) |
| |
| Detect and propagate errors to fix this. |
| |
| Fixes: f3186dd876697e69 ("spi: Optionally use GPIO descriptors for CS GPIOs") |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/spi/spi.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c |
| index d17f68775a4bb..e3f2e15b75ad4 100644 |
| --- a/drivers/spi/spi.c |
| +++ b/drivers/spi/spi.c |
| @@ -2195,6 +2195,8 @@ static int spi_get_gpio_descs(struct spi_controller *ctlr) |
| */ |
| cs[i] = devm_gpiod_get_index_optional(dev, "cs", i, |
| GPIOD_OUT_LOW); |
| + if (IS_ERR(cs[i])) |
| + return PTR_ERR(cs[i]); |
| |
| if (cs[i]) { |
| /* |
| -- |
| 2.20.1 |
| |
