summaryrefslogtreecommitdiff
path: root/drivers/input/keyboard/gpio_keys.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/keyboard/gpio_keys.c')
-rw-r--r--drivers/input/keyboard/gpio_keys.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 711b67d70e0e..d2174f784735 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -415,15 +415,13 @@ static int __devinit gpio_keys_setup_key(struct platform_device *pdev,
if (!button->can_disable)
irqflags |= IRQF_SHARED;
/*
- * If platform has specified that the button can wake up the system,
- * for example, the power key which usually use to wake up the system
- * from suspend, we add the IRQF_EARLY_RESUME flag to this irq, so
- * that the power key press can be handled and reported as early as
- * possible. Some platform like Android need to get the power key
- * event early to reume some devcies like framebuffer and etc.
+ * Resume power key early during syscore instead of at device
+ * resume time.
+ * Some platform like Android need to konw the power key is pressed
+ * then to reume the other devcies
*/
if (button->wakeup)
- irqflags |= IRQF_EARLY_RESUME;
+ irqflags |= IRQF_NO_SUSPEND | IRQF_EARLY_RESUME;
error = request_any_context_irq(irq, gpio_keys_isr, irqflags, desc, bdata);
if (error < 0) {