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

912af52f · Mark Brown · feff98f5 · b92be6fe · 912af52f
Commit 912af52f authored Jun 30, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

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

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