Skip to contentSkip to conversation

regmap: fix wrong backport

PATCH In review Tzung-Bi Shih 2 participants 2 messages Jan 15, 2025 – Jan 16, 2025 Stable branch

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 regmap: fix wrong backport

f373a1898175 ("regmap: detach regmap from dev on regmap_exit") wrongly backported upstream commit 3061e170381a.

It should patch regmap_exit() instead of regmap_reinit_cache().

Fixes f373a1898175 ("regmap: detach regmap from dev on regmap_exit")
---
 drivers/base/regmap/regmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/regmap/regmap.c +1 -1
index 00437ed9d5e0..6d94ad8bf1eb 100644
@@ -1508,7 +1508,6 @@ int regmap_reinit_cache(struct regmap *map, const struct regmap_config *config)
 {
 	int ret;
 
-	regmap_detach_dev(map->dev, map);
 	regcache_exit(map);
 	regmap_debugfs_exit(map);
 
@@ -1543,6 +1542,7 @@ void regmap_exit(struct regmap *map)
 {
 	struct regmap_async *async;
 
+	regmap_detach_dev(map->dev, map);
 	regcache_exit(map);
 	regmap_debugfs_exit(map);
 	regmap_range_exit(map);
Signature · 1 line
2.48.0.rc2.279.g1de40edade-goog
maintainer
#1 lore raw

[ Sasha's backport helper bot ]

Hi,

No upstream commit was identified. Using temporary commit for testing.

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.15.y       |  Success    |  Success   |