| Message ID | 20190403144656.8257-1-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1723fdec5fcbc4de3d26bbb23a9e1704ee258955 |
| Headers | show |
| Series | spi: Add missing error handling for CS GPIOs | expand |
On Wed, Apr 3, 2019 at 4:46 PM Geert Uytterhoeven <geert+renesas@glider.be> wrote: > 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> Good catch! Sorry for my bugs... Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index bd2a424672df266c..2ad20c735b61c4aa 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -2199,6 +2199,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]) { /*
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> --- drivers/spi/spi.c | 2 ++ 1 file changed, 2 insertions(+)