OSDN Git Service

gpio: gpio-mxc: gpio_set_wake_irq() use proper return values
authorPhilipp Rosenberger <p.rosenberger@linutronix.de>
Wed, 12 Jul 2017 08:36:40 +0000 (10:36 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 14 Aug 2017 13:01:12 +0000 (15:01 +0200)
Errors from enable_irq_wake() in gpio_set_wake_irq() were silently ignored.
Thus led to the problem that gpio_set_wake_irq() always returned
successfully, even if enable_irq_wake() returned an error.

Signed-off-by: Philipp Rosenberger <p.rosenberger@linutronix.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpio-mxc.c

index 9269225..3dcd990 100644 (file)
@@ -324,20 +324,21 @@ static int gpio_set_wake_irq(struct irq_data *d, u32 enable)
        struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
        struct mxc_gpio_port *port = gc->private;
        u32 gpio_idx = d->hwirq;
+       int ret;
 
        if (enable) {
                if (port->irq_high && (gpio_idx >= 16))
-                       enable_irq_wake(port->irq_high);
+                       ret = enable_irq_wake(port->irq_high);
                else
-                       enable_irq_wake(port->irq);
+                       ret = enable_irq_wake(port->irq);
        } else {
                if (port->irq_high && (gpio_idx >= 16))
-                       disable_irq_wake(port->irq_high);
+                       ret = disable_irq_wake(port->irq_high);
                else
-                       disable_irq_wake(port->irq);
+                       ret = disable_irq_wake(port->irq);
        }
 
-       return 0;
+       return ret;
 }
 
 static int mxc_gpio_init_gc(struct mxc_gpio_port *port, int irq_base)