diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-05-02 13:13:10 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-05-02 13:34:21 +0200 |
| commit | 4c37ce8608a8c6521726d4cd1d4f54424e8d095f (patch) | |
| tree | eee58f88ba6ba7a536b43f3b15775b95197b3c70 /drivers/gpio | |
| parent | 3b711e0781f34400326f911c15784e84deca84b6 (diff) | |
| download | linux-next-4c37ce8608a8c6521726d4cd1d4f54424e8d095f.tar.gz | |
gpio: make gpiod_to_irq() return negative for NO_IRQ
If a translation returns zero, that means NO_IRQ, so we
should return an error since the function is documented to
return a negative code on error.
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpiolib.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 340b021a3782..a68c6d732818 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1999,13 +1999,22 @@ EXPORT_SYMBOL_GPL(gpiod_cansleep); */ int gpiod_to_irq(const struct gpio_desc *desc) { - struct gpio_chip *chip; - int offset; + struct gpio_chip *chip; + int offset; VALIDATE_DESC(desc); chip = desc->gdev->chip; offset = gpio_chip_hwgpio(desc); - return chip->to_irq ? chip->to_irq(chip, offset) : -ENXIO; + if (chip->to_irq) { + int retirq = chip->to_irq(chip, offset); + + /* Zero means NO_IRQ */ + if (!retirq) + return -ENXIO; + + return retirq; + } + return -ENXIO; } EXPORT_SYMBOL_GPL(gpiod_to_irq); |