pinctrl: intel: Don't shadow error code of gpiochip_lock_as_irq()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 30 Jul 2018 12:38:30 +0000 (15:38 +0300)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 3 Aug 2018 17:42:58 +0000 (19:42 +0200)
gpiochip_lock_as_irq() may return a few error codes,
do not shadow them by -EINVAL and let caller to decide.

No functional change intended.

Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/intel/pinctrl-intel.c

index d023b64825d081798745135f92f51b6ec4833f9e..62b009b27eda3979a9ff6957218f189c33392809 100644 (file)
@@ -877,13 +877,15 @@ static int intel_gpio_irq_reqres(struct irq_data *d)
        struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
        struct intel_pinctrl *pctrl = gpiochip_get_data(gc);
        int pin;
+       int ret;
 
        pin = intel_gpio_to_pin(pctrl, irqd_to_hwirq(d), NULL, NULL);
        if (pin >= 0) {
-               if (gpiochip_lock_as_irq(gc, pin)) {
+               ret = gpiochip_lock_as_irq(gc, pin);
+               if (ret) {
                        dev_err(pctrl->dev, "unable to lock HW IRQ %d for IRQ\n",
                                pin);
-                       return -EINVAL;
+                       return ret;
                }
        }
        return 0;