---

yaml --- r: 319739 b: refs/heads/master c: 1a2017b h: refs/heads/master i: 319737: f75266a 319735: 5be3235 v: v3
git-mirror · Jul 8, 2012 · 41aa420 · 41aa420
1 parent a2e0f1e
commit 41aa420
Show file tree

Hide file tree

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