diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-29 20:49:42 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-29 20:49:42 +0100 |
| commit | f5b313a2bcd4c436560c044c726d9ad84a3e4bb3 (patch) | |
| tree | 3687b5f13846d00e788a41f5c4bd4854ac73c3db /drivers/base | |
| parent | 45942c310da8eadc603e7d2332897909c1da4b70 (diff) | |
| parent | f29a43206ae1adfadbb344f5ef9bc200784f9d61 (diff) | |
| download | linux-stable-f5b313a2bcd4c436560c044c726d9ad84a3e4bb3.tar.gz linux-stable-f5b313a2bcd4c436560c044c726d9ad84a3e4bb3.tar.bz2 linux-stable-f5b313a2bcd4c436560c044c726d9ad84a3e4bb3.zip | |
Merge remote-tracking branch 'regmap/topic/cache' into regmap-next
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/regcache.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c index 5617da6dc898..f1280dc356d0 100644 --- a/drivers/base/regmap/regcache.c +++ b/drivers/base/regmap/regcache.c @@ -269,8 +269,11 @@ static int regcache_default_sync(struct regmap *map, unsigned int min, map->cache_bypass = 1; ret = _regmap_write(map, reg, val); map->cache_bypass = 0; - if (ret) + if (ret) { + dev_err(map->dev, "Unable to sync register %#x. %d\n", + reg, ret); return ret; + } dev_dbg(map->dev, "Synced register %#x, value %#x\n", reg, val); } @@ -615,8 +618,11 @@ static int regcache_sync_block_single(struct regmap *map, void *block, ret = _regmap_write(map, regtmp, val); map->cache_bypass = 0; - if (ret != 0) + if (ret != 0) { + dev_err(map->dev, "Unable to sync register %#x. %d\n", + regtmp, ret); return ret; + } dev_dbg(map->dev, "Synced register %#x, value %#x\n", regtmp, val); } @@ -641,6 +647,9 @@ static int regcache_sync_block_raw_flush(struct regmap *map, const void **data, map->cache_bypass = 1; ret = _regmap_raw_write(map, base, *data, count * val_bytes); + if (ret) + dev_err(map->dev, "Unable to sync registers %#x-%#x. %d\n", + base, cur - map->reg_stride, ret); map->cache_bypass = 0; |