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

Commit bff98bfc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap 

Fixes a bootstrapping issue for some registers when a less commonly used
method for register cache initialisation is used.  Only affects a fairly
small proportion of users that both don't use explicit register defaults
and do use the cache.

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: Fix cache defaults initialization from raw cache defaults
parents 46860666 61cddc57

drivers/base/regmap/regcache.c

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static int regcache_hw_init(struct regmap *map) 
	for (count = 0, i = 0; i < map->num_reg_defaults_raw; i++) {

		val = regcache_get_val(map->reg_defaults_raw,

				       i, map->cache_word_size);

		if (!val)

		if (regmap_volatile(map, i))

			continue;

		count++;

	}
@@ -70,7 +70,7 @@ static int regcache_hw_init(struct regmap *map) 
	for (i = 0, j = 0; i < map->num_reg_defaults_raw; i++) {

		val = regcache_get_val(map->reg_defaults_raw,

				       i, map->cache_word_size);

		if (!val)

		if (regmap_volatile(map, i))

			continue;

		map->reg_defaults[j].reg = i;

		map->reg_defaults[j].def = val;