summaryrefslogtreecommitdiff
path: root/drivers/input/misc
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2014-11-07 15:46:56 -0800
committerLuis Henriques <luis.henriques@canonical.com>2015-05-06 11:33:12 +0100
commit3ba0732b233fface0808cf23e4066bfd04e21766 (patch)
tree6932dc7fce985a7cce5f2480ff23f4201e482879 /drivers/input/misc
parent1edf5ca166be9dadbcb4c3fab3e8400ac73a0a5e (diff)
Input: twl4030-pwrbutton - ensure a wakeup event is recorded.
commit c42bfd7f6cd26e8f712fc184460e32845d928d17 upstream. This button is treated as a wakeup source, so we need to initialise it correctly. Without the device_init_wakeup() call, dev->power.wakeup will be NULL, and pm_wakeup_event() will do nothing. Signed-off-by: NeilBrown <neilb@suse.de> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/input/misc')
-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 fb3b63b2f85c..8400a1a34d87 100644
--- a/drivers/input/misc/twl4030-pwrbutton.c
+++ b/drivers/input/misc/twl4030-pwrbutton.c
@@ -85,6 +85,7 @@ static int twl4030_pwrbutton_probe(struct platform_device *pdev)
}
platform_set_drvdata(pdev, pwr);
+ device_init_wakeup(&pdev->dev, true);
return 0;
}