---

yaml --- r: 283924 b: refs/heads/master c: be79cf2 h: refs/heads/master v: v3
git-mirror · Dec 12, 2011 · 2dd5eb4 · 2dd5eb4
1 parent 46640ad
commit 2dd5eb4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26c34c25e54b4a352596d88c6e44a239dab8e1c5
+refs/heads/master: be79cf2fd258bf4566d8abf28b8c3ac3b985b1b4
diff --git a/trunk/drivers/mfd/wm8994-core.c b/trunk/drivers/mfd/wm8994-core.c
@@ -276,7 +276,8 @@ static int wm8994_suspend(struct device *dev)
 	/* Explicitly put the device into reset in case regulators
 	 * don't get disabled in order to ensure consistent restart.
 	 */
-	wm8994_reg_write(wm8994, WM8994_SOFTWARE_RESET, 0x8994);
+	wm8994_reg_write(wm8994, WM8994_SOFTWARE_RESET,
+			 wm8994_reg_read(wm8994, WM8994_SOFTWARE_RESET));
 
 	wm8994->suspended = true;