diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-06 17:33:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-06 17:33:36 +0100 |
| commit | eec756540b1c9b6286e7b9162928c1285b0aec32 (patch) | |
| tree | 885ec50ea3daedbe42da902107be18d1810222d3 /drivers/base | |
| parent | 83d460a640af052ee4a6b8ef5104022ffd6d6a3b (diff) | |
| parent | 2023c00d650dfa409e58539596aca7d9deded824 (diff) | |
Merge tag 'v3.14.20' into linux-linaro-lsk-v3.14
This is the 3.14.20 stable release
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/regcache.c | 2 | ||||
| -rw-r--r-- | drivers/base/regmap/regmap.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c index d4dd77134814..154e7a8c0a04 100644 --- a/drivers/base/regmap/regcache.c +++ b/drivers/base/regmap/regcache.c @@ -701,7 +701,7 @@ int regcache_sync_block(struct regmap *map, void *block, unsigned int block_base, unsigned int start, unsigned int end) { - if (regmap_can_raw_write(map)) + if (regmap_can_raw_write(map) && !map->use_single_rw) return regcache_sync_block_raw(map, block, cache_present, block_base, start, end); else diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 6a19515f8a45..2ea056c09aeb 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -105,7 +105,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) |