From 227061811126e2e4102fbe112777871c70465c64 Mon Sep 17 00:00:00 2001
From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Date: Tue, 20 Nov 2012 14:49:10 +0900
Subject: [PATCH] --- yaml --- r: 336030 b: refs/heads/master c:
 46b9d13aaec19dfbd5882a999e8ed85fc97a751e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 64df2cea9e94..6ae5eacd327a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ebef34d5cf658752d000001d2a6a5defe8cf3a9
+refs/heads/master: 46b9d13aaec19dfbd5882a999e8ed85fc97a751e
diff --git a/trunk/drivers/mfd/arizona-core.c b/trunk/drivers/mfd/arizona-core.c
index 202bf55c3cc9..f4f9bf84bc7b 100644
--- a/trunk/drivers/mfd/arizona-core.c
+++ b/trunk/drivers/mfd/arizona-core.c
@@ -415,11 +415,19 @@ int __devinit arizona_dev_init(struct arizona *arizona)
 
 	/* If we have a /RESET GPIO we'll already be reset */
 	if (!arizona->pdata.reset) {
+		regcache_mark_dirty(arizona->regmap);
+
 		ret = regmap_write(arizona->regmap, ARIZONA_SOFTWARE_RESET, 0);
 		if (ret != 0) {
 			dev_err(dev, "Failed to reset device: %d\n", ret);
 			goto err_reset;
 		}
+
+		ret = regcache_sync(arizona->regmap);
+		if (ret != 0) {
+			dev_err(dev, "Failed to sync device: %d\n", ret);
+			goto err_reset;
+		}
 	}
 
 	ret = arizona_wait_for_boot(arizona);