summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaer-Olof Haakansson <par-olof.hakansson@stericsson.com>2012-02-28 16:37:25 +0100
committerPhilippe Langlais <philippe.langlais@linaro.org>2012-03-19 08:55:57 +0100
commit1133af78634d3bcfaf3af12eb208d906af36efb5 (patch)
tree88e1a272c49681bf2a313d6c657f6f1ae0e5b875
parentfb5bfed075cbabac72a40cda7db90bf77393fe8d (diff)
ab8500-gpio: allow gpios waking system from suspend
ST-Ericsson Linux next: NA Depends-On: I5ae895adc38fd2128953010342930cd0c92d27be ST-Ericsson ID: 399003 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I361ace3fc37b010d544a1d906adbce535078dd14 Signed-off-by: Paer-Olof Haakansson <par-olof.hakansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/50783 Reviewed-by: QABUILD Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
-rw-r--r--drivers/gpio/gpio-ab8500.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-ab8500.c b/drivers/gpio/gpio-ab8500.c
index 86163681c24..ef75984486c 100644
--- a/drivers/gpio/gpio-ab8500.c
+++ b/drivers/gpio/gpio-ab8500.c
@@ -329,12 +329,12 @@ static void ab8500_gpio_irq_sync_unlock(struct irq_data *data)
if (rising)
ret = request_threaded_irq(irq_to_rising(irq),
NULL, handle_rising,
- IRQF_TRIGGER_RISING,
+ IRQF_TRIGGER_RISING | IRQF_NO_SUSPEND,
"ab8500-gpio-r", ab8500_gpio);
if (falling)
ret = request_threaded_irq(irq_to_falling(irq),
NULL, handle_falling,
- IRQF_TRIGGER_FALLING,
+ IRQF_TRIGGER_FALLING | IRQF_NO_SUSPEND,
"ab8500-gpio-f", ab8500_gpio);
break;
case SHUTDOWN: