Merge remote-tracking branch 'regmap/topic/core' into regmap-next

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 1a01553189b3..ed152e3d2d88 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -123,7 +123,10 @@ bool regmap_volatile(struct regmap *map, unsigned int reg)
         if (map->volatile_table)
                 return regmap_check_range_table(map, reg, map->volatile_table);
 
-        return true;
+        if (map->cache_ops)
+                return false;
+        else
+                return true;
 }
 
 bool regmap_precious(struct regmap *map, unsigned int reg)