diff options
| author | Mark Brown <broonie@kernel.org> | 2020-11-30 18:16:06 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-11-30 18:16:06 +0000 |
| commit | 4616c509d187d2afda4a8f1121c2a3ef16bbcefe (patch) | |
| tree | 1db1557c8f8c789872cfc69523dc8fe6ec11f658 /drivers/base/regmap/regmap.c | |
| parent | e6e9354b58307c120afbdc2719a6093638c37446 (diff) | |
| parent | a8ecace132fa321f7fcc0650c4e486938a2a4bcb (diff) | |
| download | linux-4616c509d187d2afda4a8f1121c2a3ef16bbcefe.tar.bz2 | |
Merge remote-tracking branch 'regmap/for-5.11' into regmap-next
Diffstat (limited to 'drivers/base/regmap/regmap.c')
| -rw-r--r-- | drivers/base/regmap/regmap.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 5db536ccfcd6..297e95be25b3 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1924,12 +1924,15 @@ int _regmap_write(struct regmap *map, unsigned int reg, } } - if (regmap_should_log(map)) - dev_info(map->dev, "%x <= %x\n", reg, val); + ret = map->reg_write(context, reg, val); + if (ret == 0) { + if (regmap_should_log(map)) + dev_info(map->dev, "%x <= %x\n", reg, val); - trace_regmap_reg_write(map, reg, val); + trace_regmap_reg_write(map, reg, val); + } - return map->reg_write(context, reg, val); + return ret; } /** |