[3.16.y-ckt stable] Patch "Input: twl4030-pwrbutton - ensure a wakeup event is recorded." has been added to staging queue

[Luis Henriques]

This is a note to let you know that I have just added a patch titled

    Input: twl4030-pwrbutton - ensure a wakeup event is recorded.

to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree 
which can be found at:

    http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.16.y-queue

This patch is scheduled to be released in version 3.16.7-ckt11.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.16.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From de08f36ef0e1013f00c13cea89bf73f71614447c Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb at suse.de>
Date: Fri, 7 Nov 2014 15:46:56 -0800
Subject: 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 at suse.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov at gmail.com>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 drivers/input/misc/twl4030-pwrbutton.c | 1 +
 1 file changed, 1 insertion(+)

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;
 }