summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-25 22:05:48 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-25 22:22:05 +0100
commit8a892d6996b60c822f19ad1844eb15b96ce393c7 (patch)
treee3b2281798d9188cb69f21ff9d965d1073a69957 /drivers
parentregmap: Skip patch application when the cache is not dirty on sync (diff)
downloadlinux-8a892d6996b60c822f19ad1844eb15b96ce393c7.tar.xz
linux-8a892d6996b60c822f19ad1844eb15b96ce393c7.zip
regmap: Bypass the cache when applying patches
Otherwise any patch that affects a register which is writable may trash cached values. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/regmap/regcache.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index 9c6a5c13f1da..ee36bed9479c 100644
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -273,6 +273,7 @@ int regcache_sync(struct regmap *map)
goto out;
/* Apply any patch first */
+ map->cache_bypass = 1;
for (i = 0; i < map->patch_regs; i++) {
ret = _regmap_write(map, map->patch[i].reg, map->patch[i].def);
if (ret != 0) {
@@ -281,6 +282,7 @@ int regcache_sync(struct regmap *map)
goto out;
}
}
+ map->cache_bypass = 0;
if (map->cache_ops->sync) {
ret = map->cache_ops->sync(map);