summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-mxc.c
diff options
context:
space:
mode:
authorPhilipp Rosenberger <p.rosenberger@linutronix.de>2017-07-12 10:36:39 +0200
committerLinus Walleij <linus.walleij@linaro.org>2017-08-01 10:37:06 +0200
commitcc9269f89643c8684eb516ab3cd1cb49385f83fa (patch)
treeadeb3d4eac3d1e7d54d7ffe06b3b8faf61515983 /drivers/gpio/gpio-mxc.c
parentgpio: xgene-sb: select IRQ_DOMAIN_HIERARCHY (diff)
downloadlinux-cc9269f89643c8684eb516ab3cd1cb49385f83fa.tar.xz
linux-cc9269f89643c8684eb516ab3cd1cb49385f83fa.zip
gpio: gpio-mxc: Fix: higher 16 GPIOs usable as wake source
In the function gpio_set_wake_irq(), port->irq_high is only checked for zero. As platform_get_irq() returns a value less then zero if no interrupt was found, any gpio >= 16 was handled like an irq_high interrupt was available. On iMX27 for example no high interrupt is available. This lead to the problem that only some gpios (the lower 16) were useable as wake sources. Signed-off-by: Philipp Rosenberger <p.rosenberger@linutronix.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-mxc.c')
-rw-r--r--drivers/gpio/gpio-mxc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
index 3abea3f0b307..92692251ade1 100644
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@ -424,6 +424,9 @@ static int mxc_gpio_probe(struct platform_device *pdev)
return PTR_ERR(port->base);
port->irq_high = platform_get_irq(pdev, 1);
+ if (port->irq_high < 0)
+ port->irq_high = 0;
+
port->irq = platform_get_irq(pdev, 0);
if (port->irq < 0)
return port->irq;