summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Rosenberger <p.rosenberger@linutronix.de>2017-07-12 10:36:40 +0200
committerLinus Walleij <linus.walleij@linaro.org>2017-08-14 15:01:12 +0200
commit77a4d757195fcf40f5cc0eaa1b6f5eb9a4d23851 (patch)
tree1c89ea6639180e8fdaaefa672b55536561ea3489
parentdbd1dad2ab8ffca57e0aa386df0d7ec621c26ca8 (diff)
downloadlinux-stable-77a4d757195fcf40f5cc0eaa1b6f5eb9a4d23851.tar.gz
linux-stable-77a4d757195fcf40f5cc0eaa1b6f5eb9a4d23851.tar.bz2
linux-stable-77a4d757195fcf40f5cc0eaa1b6f5eb9a4d23851.zip
gpio: gpio-mxc: gpio_set_wake_irq() use proper return values
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>
-rw-r--r--drivers/gpio/gpio-mxc.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
index 92692251ade1..3dcd990f416e 100644
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@ -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)