diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-30 12:40:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-30 12:40:02 +0100 |
| commit | 912af52f31e7debfeb19c024c8280900a3c4e1a2 (patch) | |
| tree | 7dfe8e613c54df2c1893f816250f8575b11577a7 /drivers/base | |
| parent | feff98f5507f98c0422252caec41c3be9e6b6399 (diff) | |
| parent | b92be6fecc9f1e8b927d99c12dad9f9dcd729727 (diff) | |
| download | linux-912af52f31e7debfeb19c024c8280900a3c4e1a2.tar.gz linux-912af52f31e7debfeb19c024c8280900a3c4e1a2.tar.bz2 linux-912af52f31e7debfeb19c024c8280900a3c4e1a2.zip | |
Merge remote-tracking branch 'regmap/topic/core' into regmap-next
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/regmap.c | 5 |
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) |