Skip to content

Commit 4388ae2

Browse files
committed
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
2 parents d5c0b60 + fea8806 commit 4388ae2

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/base/regmap/regcache.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,7 @@ int regcache_sync(struct regmap *map)
410410
rb_entry(node, struct regmap_range_node, node);
411411

412412
/* If there's nothing in the cache there's nothing to sync */
413-
ret = regcache_read(map, this->selector_reg, &i);
414-
if (ret != 0)
413+
if (regcache_read(map, this->selector_reg, &i) != 0)
415414
continue;
416415

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

0 commit comments

Comments
 (0)