diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-09-16 19:45:58 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-09-16 19:45:58 +0000 |
| commit | 33478cc104c137ff0cab6ba2b63ac9d740681dbb (patch) | |
| tree | 62bed8fdbe5042324fdce8f3fa779d8485fa2eca /drivers/base | |
| parent | e54bee29a4192399bac0a07b7267869733b26457 (diff) | |
| parent | 48a24510c328b3b3d7775377494b4ad4f58d189a (diff) | |
Merge tag 'v5.4.147' into 5.4-2.3.x-imx
This is the 5.4.147 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
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 953acc8be48e..11aa8c120f55 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1503,7 +1503,7 @@ static int _regmap_raw_write_impl(struct regmap *map, unsigned int reg, if (ret) { dev_err(map->dev, "Error in caching of register: %x ret: %d\n", - reg + i, ret); + reg + regmap_get_offset(map, i), ret); return ret; } } |