diff options
| author | Marco Felsch <m.felsch@pengutronix.de> | 2018-10-18 12:43:46 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-10-19 14:18:58 +0200 |
| commit | 94d60ed19b966c1ff7644273aeb31bd89013df4f (patch) | |
| tree | 614b5abd3b9dd7a998dbcab26408fa3ee284994d /drivers/gpio | |
| parent | 2c76867dce40761575f9f3e5cbf7d49e03af3de5 (diff) | |
| download | barebox-94d60ed19b966c1ff7644273aeb31bd89013df4f.tar.gz barebox-94d60ed19b966c1ff7644273aeb31bd89013df4f.tar.xz | |
gpiolib: fix of_gpio_hog error handling
Currently the error handling of gpio_get_num() checks the return value
of the previous of_property_read_u32_index() which has it's own error
check. Fix it by using the correct return value variable.
Fixes: 37e6bee7e5 ("gpiolib: Add support for GPIO "hog" nodes")
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpiolib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index b83a27de7d..4e0bf73742 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -352,12 +352,12 @@ static int of_hog_gpio(struct device_node *np, struct gpio_chip *chip, flags |= GPIOF_ACTIVE_LOW; gpio = gpio_get_num(chip->dev, gpio_num); - if (ret == -EPROBE_DEFER) - return ret; + if (gpio == -EPROBE_DEFER) + return gpio; - if (ret < 0) { + if (gpio < 0) { dev_err(chip->dev, "unable to get gpio %u\n", gpio_num); - return ret; + return gpio; } |