leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpio: convince line to become input in irq helper

Browse Source 
The generic IRQ helper library just checks if the IRQ line is
set as input before activating it for interrupts. As we
recently started to check things better with .get_dir() it
turns out that it's good to try to convince the line to become
an input before attempting to lock it as IRQ.

Reviewed-by: Björn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2016-06-22 16:31:54 +02:00
parent 33265b17e0
commit 7e7c059cb5
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpio/gpiolib.c
View File

@ -1505,6 +1505,25 @@ static int gpiochip_irq_reqres(struct irq_data *d)
if (!try_module_get(chip->gpiodev->owner))
return -ENODEV;
/*
* If it is possible to switch this GPIO to an input
* this is a good time to do it.
*/
if (chip->direction_input) {
struct gpio_desc *desc;
int ret;
desc = gpiochip_get_desc(chip, d->hwirq);
if (IS_ERR(desc))
return PTR_ERR(desc);
ret = chip->direction_input(chip, d->hwirq);
if (ret)
return ret;
clear_bit(FLAG_IS_OUT, &desc->flags);
}
if (gpiochip_lock_as_irq(chip, d->hwirq)) {
chip_err(chip,
"unable to lock HW IRQ %lu for IRQ\n",