Commit 4388ae22 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regmap-fix-v6.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap 

Pull regmap fix from Mark Brown:
 "An incremental fix for the fix introduced during the merge window for
  caching of the selector for windowed register ranges. We were
  incorrectly leaking an error code in the case where the last selector
  accessed was for some reason not cached"

* tag 'regmap-fix-v6.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: fix bogus error on regcache_sync success
parents d5c0b601 fea88064

drivers/base/regmap/regcache.c

+1 −2
Original line number Diff line number Diff line
@@ -410,8 +410,7 @@ int regcache_sync(struct regmap *map) 
			rb_entry(node, struct regmap_range_node, node);



		/* If there's nothing in the cache there's nothing to sync */

		ret = regcache_read(map, this->selector_reg, &i);

		if (ret != 0)

		if (regcache_read(map, this->selector_reg, &i) != 0)

			continue;



		ret = _regmap_write(map, this->selector_reg, i);