Merge tag 'regmap-fix-v7.2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

fa956617 · Linus Torvalds <[email protected]> · 2026-06-26 10:47:26 -07:00

Pull regmap fix from Mark Brown:
 "Ensure that we don't overwrite the error code when cleaning up a
  failed cache initialisation, helping people debug issues if they
  do arise"

* tag 'regmap-fix-v7.2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regcache: Do not overwrite error code when finalizing cache after error

Commit: fa956617b89c0669c651bf4f301ded8e9b20c6db
Parents: fc91b7d7 · 9108f7fa

Merge commit. Changes below are compared with the first parent: fc91b7d7.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
drivers/base/regmap/regcache.c	modified	+1	−1	View file

drivers/base/regmap/regcache.c

View file

diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index 27616b0..aa8f2ef 100644
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -245,7 +245,7 @@ err_exit:
 	if (map->cache_ops->exit) {
 		dev_dbg(map->dev, "Destroying %s cache\n", map->cache_ops->name);
 		map->lock(map->lock_arg);
-		ret = map->cache_ops->exit(map);
+		map->cache_ops->exit(map);
 		map->unlock(map->lock_arg);
 	}
 err_free_reg_defaults: