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

2013-06-30 12:40:02 +01:00 · 2013-06-30 12:40:02 +01:00 · 912af52f31
parent feff98f550 b92be6fecc
commit 912af52f31
1 changed files with 4 additions and 1 deletions
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@ -123,6 +123,9 @@ bool regmap_volatile(struct regmap *map, unsigned int reg)
 	if (map->volatile_table)
 		return regmap_check_range_table(map, reg, map->volatile_table);

+	if (map->cache_ops)
+		return false;
+	else
 		return true;
 }