evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

regmap: Save/restore the bypass state upon syncing

Browse source 
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Dimitris Papastamos 2011-09-29 14:36:26 +01:00 • committed by Mark Brown
parent 13753a9088
commit beb1a10f21
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/base/regmap/regcache.c
View file

@ -227,10 +227,13 @@ int regcache_sync(struct regmap *map)
unsigned int val; unsigned int val;
unsigned int i; unsigned int i;
const char *name; const char *name;
unsigned int bypass;
BUG_ON(!map->cache_ops); BUG_ON(!map->cache_ops);
mutex_lock(&map->lock); mutex_lock(&map->lock);
/* Remember the initial bypass state */
bypass = map->cache_bypass;
dev_dbg(map->dev, "Syncing %s cache\n", dev_dbg(map->dev, "Syncing %s cache\n",
map->cache_ops->name); map->cache_ops->name);
name = map->cache_ops->name; name = map->cache_ops->name;
@ -255,6 +258,8 @@ int regcache_sync(struct regmap *map)
} }
out: out:
trace_regcache_sync(map->dev, name, "stop"); trace_regcache_sync(map->dev, name, "stop");
/* Restore the bypass state */
map->cache_bypass = bypass;
mutex_unlock(&map->lock); mutex_unlock(&map->lock);
return ret; return ret;