diff options
| author | Linus Walleij | 2016-06-15 22:57:38 +0200 |
|---|---|---|
| committer | Linus Walleij | 2016-06-17 18:12:07 +0200 |
| commit | 79bb71bd1d93197ce227fa167b450b633f30a52b (patch) | |
| tree | bf2edaee0bd70d92406b10e15d82ef80ea248389 | |
| parent | gpio: 104-idi-48: Fix missing spin_lock_init for ack_lock (diff) | |
| download | kernel-qcow2-linux-79bb71bd1d93197ce227fa167b450b633f30a52b.tar.gz kernel-qcow2-linux-79bb71bd1d93197ce227fa167b450b633f30a52b.tar.xz kernel-qcow2-linux-79bb71bd1d93197ce227fa167b450b633f30a52b.zip | |
gpio: make sure gpiod_to_irq() returns negative on NULL desc
commit 54d77198fdfbc4f0fe11b4252c1d9c97d51a3264
("gpio: bail out silently on NULL descriptors")
doesn't work for gpiod_to_irq(): drivers assume that NULL
descriptors will give negative IRQ numbers in return.
It has been pointed out that returning 0 is NO_IRQ and that
drivers should be amended to treat this as an error, but that
is for the longer term: now let us repair the semantics.
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Reported-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | drivers/gpio/gpiolib.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 58d822d7e8da..f39bf05993e7 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -2056,7 +2056,14 @@ int gpiod_to_irq(const struct gpio_desc *desc) struct gpio_chip *chip; int offset; - VALIDATE_DESC(desc); + /* + * Cannot VALIDATE_DESC() here as gpiod_to_irq() consumer semantics + * requires this function to not return zero on an invalid descriptor + * but rather a negative error number. + */ + if (!desc || !desc->gdev || !desc->gdev->chip) + return -EINVAL; + chip = desc->gdev->chip; offset = gpio_chip_hwgpio(desc); if (chip->to_irq) { |