[PATCH 6.1.y] regmap: fix wrong backport

[PATCH 6.1.y] regmap: fix wrong backport

[Tzung-Bi Shih]

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

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

Fixes: 48dc44f3c1af ("regmap: detach regmap from dev on regmap_exit")
Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org>
---
 drivers/base/regmap/regmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 8748cea3bc38..f0e314abcafc 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1513,7 +1513,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);
 
@@ -1548,6 +1547,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);
-- 
2.48.0.rc2.279.g1de40edade-goog

Re: [PATCH 6.1.y] regmap: fix wrong backport

[Sasha Levin]

[ 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-6.1.y        |  Success    |  Success   |

Re: [PATCH 6.1.y] regmap: fix wrong backport

[Greg KH]

On Wed, Jan 15, 2025 at 03:32:44AM +0000, Tzung-Bi Shih wrote:
> 48dc44f3c1af ("regmap: detach regmap from dev on regmap_exit")
> wrongly backported upstream commit 3061e170381a.
> 
> It should patch regmap_exit() instead of regmap_reinit_cache().
> 
> Fixes: 48dc44f3c1af ("regmap: detach regmap from dev on regmap_exit")
> Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org>
> ---
>  drivers/base/regmap/regmap.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

How about submitting a revert of the mistake and then the original
commit properly backported as a patch series of 2 commits?  That way it
makes it more obvious what is happening here.

thanks,

greg k-h

Re: [PATCH 6.1.y] regmap: fix wrong backport

[Greg KH]

On Tue, Jan 21, 2025 at 02:23:31PM +0100, Greg KH wrote:
> On Wed, Jan 15, 2025 at 03:32:44AM +0000, Tzung-Bi Shih wrote:
> > 48dc44f3c1af ("regmap: detach regmap from dev on regmap_exit")
> > wrongly backported upstream commit 3061e170381a.
> > 
> > It should patch regmap_exit() instead of regmap_reinit_cache().
> > 
> > Fixes: 48dc44f3c1af ("regmap: detach regmap from dev on regmap_exit")
> > Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org>
> > ---
> >  drivers/base/regmap/regmap.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> How about submitting a revert of the mistake and then the original
> commit properly backported as a patch series of 2 commits?  That way it
> makes it more obvious what is happening here.

I've done the revert now, a fixed up backport would be appreciated now.

thanks

greg k-h