mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
gpio: make sure gpiod_to_irq() returns negative on NULL desc
commit 54d77198fd
("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 <[email protected]>
Reported-by: Hans de Goede <[email protected]>
Tested-by: Hans de Goede <[email protected]>
Signed-off-by: Linus Walleij <[email protected]>
This commit is contained in:
parent
053ae6499a
commit
79bb71bd1d
1 changed files with 8 additions and 1 deletions
|
|
@ -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) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue