diff options
| author | Mark Brown <broonie@kernel.org> | 2016-09-03 12:10:08 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-09-03 12:10:08 +0100 |
| commit | f735aa279021149ef600febe07333ad218783d79 (patch) | |
| tree | 2fbed0919dc42ab2878bef27be3ca6ac111c2644 | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
| parent | 815806e39bf6f7e7b34875d4a9609dbe76661782 (diff) | |
| download | linux-f735aa279021149ef600febe07333ad218783d79.tar.gz linux-f735aa279021149ef600febe07333ad218783d79.tar.xz | |
Merge remote-tracking branch 'regmap/fix/cache' into regmap-linus
| -rw-r--r-- | drivers/base/regmap/regcache.c | 5 | ||||
| -rw-r--r-- | drivers/base/regmap/regmap.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c index df7ff7290821..4e582561e1e7 100644 --- a/drivers/base/regmap/regcache.c +++ b/drivers/base/regmap/regcache.c @@ -38,10 +38,11 @@ static int regcache_hw_init(struct regmap *map) /* calculate the size of reg_defaults */ for (count = 0, i = 0; i < map->num_reg_defaults_raw; i++) - if (!regmap_volatile(map, i * map->reg_stride)) + if (regmap_readable(map, i * map->reg_stride) && + !regmap_volatile(map, i * map->reg_stride)) count++; - /* all registers are volatile, so just bypass */ + /* all registers are unreadable or volatile, so just bypass */ if (!count) { map->cache_bypass = true; return 0; diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 51fa7d66a393..25d26bb18970 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1474,6 +1474,8 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg, ret = map->bus->write(map->bus_context, buf, len); kfree(buf); + } else if (ret != 0 && !map->cache_bypass && map->format.parse_val) { + regcache_drop_region(map, reg, reg + 1); } trace_regmap_hw_write_done(map, reg, val_len / map->format.val_bytes); |