[PATCH] mux: mmio: fix regmap leak on probe failure

[PATCH] mux: mmio: fix regmap leak on probe failure

[Johan Hovold]

The mmio regmap that may be allocated during probe is never freed.

Switch to using the device managed allocator so that the regmap is
released on probe failures (e.g. probe deferral) and on driver unbind.

Fixes: 61de83fd8256 ("mux: mmio: Do not use syscon helper to build regmap")
Cc: stable@vger.kernel.org	# 6.16
Cc: Andrew Davis <afd@ti.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
 drivers/mux/mmio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mux/mmio.c b/drivers/mux/mmio.c
index 9993ce38a818..5b0171d19d43 100644
--- a/drivers/mux/mmio.c
+++ b/drivers/mux/mmio.c
@@ -58,7 +58,7 @@ static int mux_mmio_probe(struct platform_device *pdev)
 		if (IS_ERR(base))
 			regmap = ERR_PTR(-ENODEV);
 		else
-			regmap = regmap_init_mmio(dev, base, &mux_mmio_regmap_cfg);
+			regmap = devm_regmap_init_mmio(dev, base, &mux_mmio_regmap_cfg);
 		/* Fallback to checking the parent node on "real" errors. */
 		if (IS_ERR(regmap) && regmap != ERR_PTR(-EPROBE_DEFER)) {
 			regmap = dev_get_regmap(dev->parent, NULL);
-- 
2.51.2

Re: [PATCH] mux: mmio: fix regmap leak on probe failure

[Andrew Davis]

On 11/27/25 7:47 AM, Johan Hovold wrote:
> The mmio regmap that may be allocated during probe is never freed.
> 
> Switch to using the device managed allocator so that the regmap is
> released on probe failures (e.g. probe deferral) and on driver unbind.
> 
> Fixes: 61de83fd8256 ("mux: mmio: Do not use syscon helper to build regmap")
> Cc: stable@vger.kernel.org	# 6.16
> Cc: Andrew Davis <afd@ti.com>
> Signed-off-by: Johan Hovold <johan@kernel.org>
> ---

Acked-by: Andrew Davis <afd@ti.com>

>   drivers/mux/mmio.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mux/mmio.c b/drivers/mux/mmio.c
> index 9993ce38a818..5b0171d19d43 100644
> --- a/drivers/mux/mmio.c
> +++ b/drivers/mux/mmio.c
> @@ -58,7 +58,7 @@ static int mux_mmio_probe(struct platform_device *pdev)
>   		if (IS_ERR(base))
>   			regmap = ERR_PTR(-ENODEV);
>   		else
> -			regmap = regmap_init_mmio(dev, base, &mux_mmio_regmap_cfg);
> +			regmap = devm_regmap_init_mmio(dev, base, &mux_mmio_regmap_cfg);
>   		/* Fallback to checking the parent node on "real" errors. */
>   		if (IS_ERR(regmap) && regmap != ERR_PTR(-EPROBE_DEFER)) {
>   			regmap = dev_get_regmap(dev->parent, NULL);

Re: [PATCH] mux: mmio: fix regmap leak on probe failure

[Johan Hovold]

On Thu, Nov 27, 2025 at 02:47:02PM +0100, Johan Hovold wrote:
> The mmio regmap that may be allocated during probe is never freed.
> 
> Switch to using the device managed allocator so that the regmap is
> released on probe failures (e.g. probe deferral) and on driver unbind.
> 
> Fixes: 61de83fd8256 ("mux: mmio: Do not use syscon helper to build regmap")
> Cc: stable@vger.kernel.org	# 6.16
> Cc: Andrew Davis <afd@ti.com>
> Signed-off-by: Johan Hovold <johan@kernel.org>
> ---

Can this one be picked up for 6.20?

Johan

Re: [PATCH] mux: mmio: fix regmap leak on probe failure

[Johan Hovold]

Hi Greg and Peter,

On Tue, Jan 27, 2026 at 04:56:15PM +0100, Johan Hovold wrote:
> On Thu, Nov 27, 2025 at 02:47:02PM +0100, Johan Hovold wrote:
> > The mmio regmap that may be allocated during probe is never freed.
> > 
> > Switch to using the device managed allocator so that the regmap is
> > released on probe failures (e.g. probe deferral) and on driver unbind.
> > 
> > Fixes: 61de83fd8256 ("mux: mmio: Do not use syscon helper to build regmap")
> > Cc: stable@vger.kernel.org	# 6.16
> > Cc: Andrew Davis <afd@ti.com>
> > Signed-off-by: Johan Hovold <johan@kernel.org>
> > ---
> 
> Can this one be picked up for 6.20?

This one has been sitting on the list for over two months now without
any comment from Peter.

I know there have been some issues in the past which patches for this
subsystem not being picked up, so perhaps you could just take this one
directly, Greg?

It's been reviewed by Andrew.

Johan

Re: [PATCH] mux: mmio: fix regmap leak on probe failure

[Greg Kroah-Hartman]

On Wed, Feb 04, 2026 at 05:18:00PM +0100, Johan Hovold wrote:
> Hi Greg and Peter,
> 
> On Tue, Jan 27, 2026 at 04:56:15PM +0100, Johan Hovold wrote:
> > On Thu, Nov 27, 2025 at 02:47:02PM +0100, Johan Hovold wrote:
> > > The mmio regmap that may be allocated during probe is never freed.
> > > 
> > > Switch to using the device managed allocator so that the regmap is
> > > released on probe failures (e.g. probe deferral) and on driver unbind.
> > > 
> > > Fixes: 61de83fd8256 ("mux: mmio: Do not use syscon helper to build regmap")
> > > Cc: stable@vger.kernel.org	# 6.16
> > > Cc: Andrew Davis <afd@ti.com>
> > > Signed-off-by: Johan Hovold <johan@kernel.org>
> > > ---
> > 
> > Can this one be picked up for 6.20?
> 
> This one has been sitting on the list for over two months now without
> any comment from Peter.
> 
> I know there have been some issues in the past which patches for this
> subsystem not being picked up, so perhaps you could just take this one
> directly, Greg?
> 
> It's been reviewed by Andrew.
> 
> Johan

Now taken, thanks.,

greg k-h