Commit 86e41a29 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'regmap/topic/core' into regmap-next

parents b2cd1df6 4c90f297
...@@ -2423,13 +2423,15 @@ static int _regmap_bus_read(void *context, unsigned int reg, ...@@ -2423,13 +2423,15 @@ static int _regmap_bus_read(void *context, unsigned int reg,
{ {
int ret; int ret;
struct regmap *map = context; struct regmap *map = context;
void *work_val = map->work_buf + map->format.reg_bytes +
map->format.pad_bytes;
if (!map->format.parse_val) if (!map->format.parse_val)
return -EINVAL; return -EINVAL;
ret = _regmap_raw_read(map, reg, map->work_buf, map->format.val_bytes); ret = _regmap_raw_read(map, reg, work_val, map->format.val_bytes);
if (ret == 0) if (ret == 0)
*val = map->format.parse_val(map->work_buf); *val = map->format.parse_val(work_val);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment