From: Mark Brown <broonie@linaro.org>
Date: Wed, 12 Jun 2013 15:28:10 +0000 (+0100)
Subject: Merge remote-tracking branch 'regmap/topic/core' into regmap-next
X-Git-Tag: next-20130617~28^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=aedf376fd34857bc13f3fc4c2f8a4c2b4754cfc0;p=karo-tx-linux.git

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

aedf376fd34857bc13f3fc4c2f8a4c2b4754cfc0
diff --cc drivers/base/regmap/regmap.c
index 1a01553189b3,2f1f3ff6c6bf..ed152e3d2d88
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@@ -121,9 -121,12 +121,12 @@@ bool regmap_volatile(struct regmap *map
  		return map->volatile_reg(map->dev, reg);
  
  	if (map->volatile_table)
 -		return _regmap_check_range_table(map, reg, 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)