We need to convince the IRQ line to become input unless there is a reason for. Also fixes up reference counting on the errorpath.
Reported-by: Geert Uytterhoeven <[email protected]> Cc: Linux-Renesas <[email protected]> Signed-off-by: Linus Walleij <[email protected]> --- Geert: does this solve the problem you saw in the RCAR in "gpio: convince line to become input in irq helper"? --- drivers/gpio/gpiolib.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 69efe278f74d..e3e3cc19b8b0 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1505,25 +1505,32 @@ static const struct irq_domain_ops gpiochip_domain_ops = { static int gpiochip_irq_reqres(struct irq_data *d) { struct gpio_chip *chip = irq_data_get_irq_chip_data(d); + struct gpio_desc *desc; if (!try_module_get(chip->gpiodev->owner)) return -ENODEV; + /* Look up the corresponding descriptor */ + desc = gpiochip_get_desc(chip, d->hwirq); + if (IS_ERR(desc)) { + module_put(chip->gpiodev->owner); + return PTR_ERR(desc); + } + /* - * If it is possible to switch this GPIO to an input - * this is a good time to do it. + * If the pin is flagged as output and 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; + if (test_bit(FLAG_IS_OUT, &desc->flags) && + chip->direction_input) { 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) + if (ret) { + module_put(chip->gpiodev->owner); return ret; + } clear_bit(FLAG_IS_OUT, &desc->flags); } -- 2.4.11
