diff options
author | Mark Brown <broonie@kernel.org> | 2018-03-12 09:50:31 -0700 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-03-12 09:50:31 -0700 |
commit | d2f2bb84877398709a12f3198a4a85c1c765eaf3 (patch) | |
tree | 531a50125e690ac352b731938cca367f337631ba /drivers/base | |
parent | 0c8efd610b58cb23cefdfa12015799079aef94ae (diff) | |
parent | 71df179363a5a733a8932e9afb869760d7559383 (diff) |
Merge remote-tracking branch 'regmap/fix/cache' into regmap-linus
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/regmap/regmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index ee302ccdfbc8..7519b039c162 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -99,7 +99,7 @@ bool regmap_cached(struct regmap *map, unsigned int reg) int ret; unsigned int val; - if (map->cache == REGCACHE_NONE) + if (map->cache_type == REGCACHE_NONE) return false; if (!map->cache_ops) |