---

yaml --- r: 284090 b: refs/heads/master c: 3befc92 h: refs/heads/master v: v3
git-mirror · Jan 9, 2012 · 578cfa2 · 578cfa2
1 parent 3acd4fa
commit 578cfa2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2ed1b0bc69e53d68aa01b79ca0944311b553fc1
+refs/heads/master: 3befc925cb658227fb207f20e6719987f7ee3190
diff --git a/trunk/drivers/mfd/wm8994-core.c b/trunk/drivers/mfd/wm8994-core.c
@@ -268,6 +268,7 @@ static int wm8994_suspend(struct device *dev)
 	wm8994_reg_write(wm8994, WM8994_SOFTWARE_RESET,
 			 wm8994_reg_read(wm8994, WM8994_SOFTWARE_RESET));
 
+	regcache_cache_only(wm8994->regmap, true);
 	regcache_mark_dirty(wm8994->regmap);
 
 	wm8994->suspended = true;
@@ -298,6 +299,7 @@ static int wm8994_resume(struct device *dev)
 		return ret;
 	}
 
+	regcache_cache_only(wm8994->regmap, false);
 	ret = regcache_sync(wm8994->regmap);
 	if (ret != 0) {
 		dev_err(dev, "Failed to restore register map: %d\n", ret);