Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 86e41a29 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents b2cd1df6 4c90f297

drivers/base/regmap/regmap.c

+4 −2
Original line number Diff line number Diff line
@@ -2423,13 +2423,15 @@ static int _regmap_bus_read(void *context, unsigned int reg, 
{

	int ret;

	struct regmap *map = context;

	void *work_val = map->work_buf + map->format.reg_bytes +

		map->format.pad_bytes;



	if (!map->format.parse_val)

		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)

		*val = map->format.parse_val(map->work_buf);

		*val = map->format.parse_val(work_val);



	return ret;

}