aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-25 15:11:57 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-25 15:11:57 -0800
commit7ca4e8c43888f1794485f48c847cb3c9b7272a7d (patch)
treeb00ec4e07346a59a7457716aa9ead4c95cd8a0d4
parent1589cb1a94c381579a0235ca708d9e2dca6d3a39 (diff)
parent421e8d2de3bd8b089dc6322d8589b7eb38437a23 (diff)
downloadlinux-linaro-stable-7ca4e8c43888f1794485f48c847cb3c9b7272a7d.tar.gz
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
A fairly simple bugfix for a WARN_ON() which was triggered in the cache reset support as a result of some subsequent work. There's only one mainline user for the code path that's updated right now (wm8994) so should be low risk. * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: regmap: Reset cache status when reinitialsing the cache
-rw-r--r--drivers/base/regmap/regmap.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index be10a4ff6609..65558034318f 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -284,6 +284,9 @@ int regmap_reinit_cache(struct regmap *map, const struct regmap_config *config)
map->precious_reg = config->precious_reg;
map->cache_type = config->cache_type;
+ map->cache_bypass = false;
+ map->cache_only = false;
+
ret = regcache_init(map, config);
mutex_unlock(&map->lock);