From 35300fef1e85af09d48cb55728e362da11d34564 Mon Sep 17 00:00:00 2001
From: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Date: Thu, 29 Sep 2011 14:36:26 +0100
Subject: [PATCH] --- yaml --- r: 267006 b: refs/heads/master c:
 beb1a10f219ce720c13168203bd5ebe4ce7879e0 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/base/regmap/regcache.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e27b73433633..0ae2dbb3cf2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13753a9088af23c61e2f5c10a8f3ea136d8ebab5
+refs/heads/master: beb1a10f219ce720c13168203bd5ebe4ce7879e0
diff --git a/trunk/drivers/base/regmap/regcache.c b/trunk/drivers/base/regmap/regcache.c
index 59e432c0163d..5dbc5076267e 100644
--- a/trunk/drivers/base/regmap/regcache.c
+++ b/trunk/drivers/base/regmap/regcache.c
@@ -227,10 +227,13 @@ int regcache_sync(struct regmap *map)
 	unsigned int val;
 	unsigned int i;
 	const char *name;
+	unsigned int bypass;
 
 	BUG_ON(!map->cache_ops);
 
 	mutex_lock(&map->lock);
+	/* Remember the initial bypass state */
+	bypass = map->cache_bypass;
 	dev_dbg(map->dev, "Syncing %s cache\n",
 		map->cache_ops->name);
 	name = map->cache_ops->name;
@@ -255,6 +258,8 @@ int regcache_sync(struct regmap *map)
 	}
 out:
 	trace_regcache_sync(map->dev, name, "stop");
+	/* Restore the bypass state */
+	map->cache_bypass = bypass;
 	mutex_unlock(&map->lock);
 
 	return ret;