diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-06 17:33:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-06 17:33:43 +0100 |
| commit | 4a105b2f855d956b419c513e1f3212a9ac1d27f5 (patch) | |
| tree | 5be5404ed57e81b8dab01db2666213ecb176f58f /drivers/base | |
| parent | defd110d5c8bd987868c8269f8dc7860fd6daec1 (diff) | |
| parent | 0ee8bb9c4864ee826e6c669f230562cd0fed8722 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/regmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index d0c81d1f409c..4b5cf2e34e9a 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -114,7 +114,7 @@ bool regmap_readable(struct regmap *map, unsigned int reg) bool regmap_volatile(struct regmap *map, unsigned int reg) { - if (!regmap_readable(map, reg)) + if (!map->format.format_write && !regmap_readable(map, reg)) return false; if (map->volatile_reg) |