From f925758292f27e74c09118400f7820e3fa68989c Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 5 Jan 2011 17:56:01 +0000
Subject: [PATCH] --- yaml --- r: 231034 b: refs/heads/master c:
 180e4f5f20ef2b03ce2b38634274dde5ccbd8951 h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/mfd/wm831x-irq.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8ad7cccc845b..b7e0eca87a9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c538ddbe4fc70ef97af02d57abad34b246b19082
+refs/heads/master: 180e4f5f20ef2b03ce2b38634274dde5ccbd8951
diff --git a/trunk/drivers/mfd/wm831x-irq.c b/trunk/drivers/mfd/wm831x-irq.c
index ee88f6a05cec..f7192d438aab 100644
--- a/trunk/drivers/mfd/wm831x-irq.c
+++ b/trunk/drivers/mfd/wm831x-irq.c
@@ -517,6 +517,17 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq)
 		return 0;
 	}
 
+	/* Try to flag /IRQ as a wake source; there are a number of
+	 * unconditional wake sources in the PMIC so this isn't
+	 * conditional but we don't actually care *too* much if it
+	 * fails.
+	 */
+	ret = enable_irq_wake(irq);
+	if (ret != 0) {
+		dev_warn(wm831x->dev, "Can't enable IRQ as wake source: %d\n",
+			 ret);
+	}
+
 	wm831x->irq = irq;
 	wm831x->irq_base = pdata->irq_base;