OSDN Git Service

spi: Add missing error handling for CS GPIOs
authorGeert Uytterhoeven <geert+renesas@glider.be>
Wed, 3 Apr 2019 14:46:56 +0000 (16:46 +0200)
committerMark Brown <broonie@kernel.org>
Thu, 4 Apr 2019 05:58:18 +0000 (12:58 +0700)
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>
drivers/spi/spi.c

index 2be394d..7b6494b 100644 (file)
@@ -2197,6 +2197,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]) {
                        /*