From b7746df4be7a9e4aa86898806a278d3f3e5ce1b4 Mon Sep 17 00:00:00 2001
From: Todd Poynor <toddpoynor@google.com>
Date: Mon, 26 Sep 2011 16:44:24 -0700
Subject: [PATCH] --- yaml --- r: 273420 b: refs/heads/master c:
 782baa20b201100e14ce065bb7b890169e7a5d3c h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/mfd/twl6030-irq.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 226678417bc0..49581928d77d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab2b9260df67e29d5bd69d989f2f84f8c2ed4238
+refs/heads/master: 782baa20b201100e14ce065bb7b890169e7a5d3c
diff --git a/trunk/drivers/mfd/twl6030-irq.c b/trunk/drivers/mfd/twl6030-irq.c
index a014ec489e68..deec3ec858bf 100644
--- a/trunk/drivers/mfd/twl6030-irq.c
+++ b/trunk/drivers/mfd/twl6030-irq.c
@@ -109,7 +109,13 @@ static int twl6030_irq_pm_notifier(struct notifier_block *notifier,
 			twl_irq_wake_enabled = false;
 		}
 
+		disable_irq(twl_irq);
 		break;
+
+	case PM_POST_SUSPEND:
+		enable_irq(twl_irq);
+		break;
+
 	default:
 		break;
 	}