---

yaml --- r: 273420 b: refs/heads/master c: 782baa2 h: refs/heads/master v: v3
git-mirror · Oct 24, 2011 · b7746df · b7746df
1 parent 2e91c66
commit b7746df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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;
 	}