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>

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index 59e432c0163d..5dbc5076267e 100644
--- a/drivers/base/regmap/regcache.c
+++ b/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;