From 41aa420a948f417b4e76760f52b3c111c6088f93 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 29 Jun 2012 14:55:40 +0100
Subject: [PATCH] --- yaml --- r: 319739 b: refs/heads/master c:
 1a2017b7143d9d0ec1b75078e76c6f55a2e55d17 h: refs/heads/master i:   319737:
 f75266ae091b9fcd74bd359835c3e66ae8ad193e   319735:
 5be323521d8a627cb910393c4630c83c57304364 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/mfd/wm8994-core.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b45e1af41cdf..7a5ae11b6c2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed393dcd419fd2a00d33cd169dded7303e1c0968
+refs/heads/master: 1a2017b7143d9d0ec1b75078e76c6f55a2e55d17
diff --git a/trunk/drivers/mfd/wm8994-core.c b/trunk/drivers/mfd/wm8994-core.c
index 53293c742a19..eec74aa55fdf 100644
--- a/trunk/drivers/mfd/wm8994-core.c
+++ b/trunk/drivers/mfd/wm8994-core.c
@@ -293,6 +293,13 @@ static int wm8994_suspend(struct device *dev)
 	if (ret != 0)
 		dev_err(dev, "Failed to restore GPIO registers: %d\n", ret);
 
+	/* In case one of the GPIOs is used as a wake input. */
+	ret = regcache_sync_region(wm8994->regmap,
+				   WM8994_INTERRUPT_STATUS_1_MASK,
+				   WM8994_INTERRUPT_STATUS_1_MASK);
+	if (ret != 0)
+		dev_err(dev, "Failed to restore interrupt mask: %d\n", ret);
+
 	regcache_cache_only(wm8994->regmap, true);
 	wm8994->suspended = true;