Merge remote-tracking branch 'regmap/fix/cache' into regmap-linus

d2f2bb84 · Mark Brown · 0c8efd61 · 71df1793 · d2f2bb84
Commit d2f2bb84 authored Mar 12, 2018 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/base/regmap/regmap.c drivers/base/regmap/regmap.c +1 -1

No files found.
--- 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)