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

Commit 3b58ee13 authored by Stephen Boyd's avatar Stephen Boyd Committed by Mark Brown
Browse files

regmap: Allow regmap_bulk_read() to work for "no-bus" regmaps 



regmap_bulk_read() should decay to performing individual reads if
we're using a "no-bus" regmap. Unfortunately, it returns an
error because there is no map->bus pointer. Fix it.

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent bd60e381

drivers/base/regmap/regmap.c

+1 −5
Original line number Diff line number Diff line
@@ -1897,14 +1897,10 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val, 
	size_t val_bytes = map->format.val_bytes;

	bool vol = regmap_volatile_range(map, reg, val_count);



	if (!map->bus)

		return -EINVAL;

	if (!map->format.parse_inplace)

		return -EINVAL;

	if (reg % map->reg_stride)

		return -EINVAL;



	if (vol || map->cache_type == REGCACHE_NONE) {

	if (map->bus && map->format.parse_inplace && (vol || map->cache_type == REGCACHE_NONE)) {

		/*

		 * Some devices does not support bulk read, for

		 * them we have a series of single read operations.