summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2014-11-08 02:46:56 +0300
committerJiri Slaby <jslaby@suse.cz>2015-04-27 20:59:56 +0300
commitd236e5ed00d0921c57dc7b41cde4227af7e3567d (patch)
treef33ae594fbb52a5cbf8337e49ee4c7b7bb20f785 /drivers/input
parent5dce3f12f1c3483ce4732f1f6452fbc31d84b3c5 (diff)
downloadlinux-d236e5ed00d0921c57dc7b41cde4227af7e3567d.tar.xz
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: Jiri Slaby <jslaby@suse.cz>
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 b9a05fda03e4..a0bb4f829fb4 100644
--- a/drivers/input/misc/twl4030-pwrbutton.c
+++ b/drivers/input/misc/twl4030-pwrbutton.c
@@ -85,6 +85,7 @@ static int __init twl4030_pwrbutton_probe(struct platform_device *pdev)
}
platform_set_drvdata(pdev, pwr);
+ device_init_wakeup(&pdev->dev, true);
return 0;