From 96e172ff6061a86eed3d0afc7cdda785a631c864 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Sun, 29 Jul 2012 22:25:51 -0700
Subject: [PATCH] --- yaml --- r: 328505 b: refs/heads/master c:
 112b51cfa21714d001e5b3e3f7c1f13146906a5d h: refs/heads/master i:   328503:
 44e2508974a7fd29b2fb5adf901c3f7e40c73ad3 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/input/misc/twl4030-pwrbutton.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d6635fc9fe52..66bd4747d9aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fba26c6595e4c1c64a74dad30f71c09708ff59a
+refs/heads/master: 112b51cfa21714d001e5b3e3f7c1f13146906a5d
diff --git a/trunk/drivers/input/misc/twl4030-pwrbutton.c b/trunk/drivers/input/misc/twl4030-pwrbutton.c
index 38e4b507b94c..b3dd96d6448b 100644
--- a/trunk/drivers/input/misc/twl4030-pwrbutton.c
+++ b/trunk/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 {