aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2012-07-29 22:25:51 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-08-21 22:29:48 -0700
commit112b51cfa21714d001e5b3e3f7c1f13146906a5d (patch)
treeb2f96402abbe2a3e219e70a89c25a78af4d0d873 /drivers/input
parentInput: gpio_keys - report a wakeup_event for a button press (diff)
downloadlinux-dev-112b51cfa21714d001e5b3e3f7c1f13146906a5d.tar.xz
linux-dev-112b51cfa21714d001e5b3e3f7c1f13146906a5d.zip
Input: twl4030-pwrbutton - report a wakeup_event on button press
As the power button causes a wake from suspend, we need to register the event with the pm sustem to avoid racing with suspend. As the input event is reported in the interrupt handler, as simple pm_wakeup_event() is sufficient. Signed-off-by: NeilBrown <neilb@suse.de> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/misc/twl4030-pwrbutton.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c
index 38e4b507b94c..b3dd96d6448b 100644
--- a/drivers/input/misc/twl4030-pwrbutton.c
+++ b/drivers/input/misc/twl4030-pwrbutton.c
@@ -42,6 +42,7 @@ static irqreturn_t powerbutton_irq(int irq, void *_pwr)
err = twl_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &value,
STS_HW_CONDITIONS);
if (!err) {
+ pm_wakeup_event(pwr->dev.parent, 0);
input_report_key(pwr, KEY_POWER, value & PWR_PWRON_IRQ);
input_sync(pwr);
} else {