commit beb1a10f219ce720c13168203bd5ebe4ce7879e0
author Dimitris Papastamos <dp@opensource.wolfsonmicro.com> Thu Sep 29 14:36:26 2011 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> Fri Sep 30 13:57:47 2011 +0100
tree 99c7f842621284fcf9313a77f963ad4dfbd0a018
parent 13753a9088af23c61e2f5c10a8f3ea136d8ebab5

regmap: Save/restore the bypass state upon syncing

Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

drivers/base/regmap/regcache.c

diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index 59e432c..5dbc507 100644
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -227,10 +227,13 @@
 	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 @@
 	}
 out:
 	trace_regcache_sync(map->dev, name, "stop");
+	/* Restore the bypass state */
+	map->cache_bypass = bypass;
 	mutex_unlock(&map->lock);
 
 	return ret;