summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorChanwoo Choi <cw00.choi@samsung.com>2014-07-10 20:10:17 +0900
committerChanho Park <chanho61.park@samsung.com>2014-08-08 15:25:40 +0900
commit7979c67d2e13964388e2add6f65930a4279cbe3a (patch)
treed8c8b6e6611ab6a3584d648e37b47f5bb0c2a99f /drivers/input
parent49467c0ded72f5b7ad9531213e7b96419829647c (diff)
downloadlinux-3.10-7979c67d2e13964388e2add6f65930a4279cbe3a.tar.gz
linux-3.10-7979c67d2e13964388e2add6f65930a4279cbe3a.tar.bz2
linux-3.10-7979c67d2e13964388e2add6f65930a4279cbe3a.zip
input: gpio_keys: Add IRQF_NO_SUSPEND flag to wake-up from freeze state
This patch add IRQF_NO_SUSPEND flag before requesting interrupt handler if button->wakeup is true. If ther interrupt of gpio-keys hasn't included IRQF_NO_SUSPEND, wouldn't wake-up from freeze state when pressing button. Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/gpio_keys.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index b29ca651a39..0b8ae51f497 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -502,6 +502,9 @@ static int gpio_keys_setup_key(struct platform_device *pdev,
if (!button->can_disable)
irqflags |= IRQF_SHARED;
+ if (button->wakeup)
+ irqflags |= IRQF_NO_SUSPEND;
+
error = request_any_context_irq(bdata->irq, isr, irqflags, desc, bdata);
if (error < 0) {
dev_err(dev, "Unable to claim irq %d; error %d\n",