aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-03-12 09:50:31 -0700
committerMark Brown <broonie@kernel.org>2018-03-12 09:50:31 -0700
commitd2f2bb84877398709a12f3198a4a85c1c765eaf3 (patch)
tree531a50125e690ac352b731938cca367f337631ba /drivers/base
parentLinux 4.16-rc5 (diff)
parentregmap: Correct comparison in regmap_cached (diff)
downloadlinux-dev-d2f2bb84877398709a12f3198a4a85c1c765eaf3.tar.xz
linux-dev-d2f2bb84877398709a12f3198a4a85c1c765eaf3.zip
Merge remote-tracking branch 'regmap/fix/cache' into regmap-linus
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/regmap/regmap.c2
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)