[PATCH] mailbox: th1520: fix clock imbalance on probe failure

[PATCH] mailbox: th1520: fix clock imbalance on probe failure

[Johan Hovold]

The purpose of the devm_add_action_or_reset() helper is to call the
action function in case adding an action ever fails so drop the clock
disable from the error path to avoid disabling the clocks twice.

Fixes: 5d4d263e1c6b ("mailbox: Introduce support for T-head TH1520 Mailbox driver")
Cc: Michal Wilczynski <m.wilczynski@samsung.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
 drivers/mailbox/mailbox-th1520.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/mailbox/mailbox-th1520.c b/drivers/mailbox/mailbox-th1520.c
index a6b2aa9ae952..626957c2e435 100644
--- a/drivers/mailbox/mailbox-th1520.c
+++ b/drivers/mailbox/mailbox-th1520.c
@@ -435,10 +435,8 @@ static int th1520_mbox_probe(struct platform_device *pdev)
 	}
 
 	ret = devm_add_action_or_reset(dev, th1520_disable_clk, priv);
-	if (ret) {
-		clk_bulk_disable_unprepare(ARRAY_SIZE(priv->clocks), priv->clocks);
+	if (ret)
 		return ret;
-	}
 
 	/*
 	 * The address mappings in the device tree align precisely with those
-- 
2.49.1

Re: [PATCH] mailbox: th1520: fix clock imbalance on probe failure

[Michal Wilczynski]

On 10/17/25 07:54, Johan Hovold wrote:
> The purpose of the devm_add_action_or_reset() helper is to call the
> action function in case adding an action ever fails so drop the clock
> disable from the error path to avoid disabling the clocks twice.
> 
> Fixes: 5d4d263e1c6b ("mailbox: Introduce support for T-head TH1520 Mailbox driver")
> Cc: Michal Wilczynski <m.wilczynski@samsung.com>
> Signed-off-by: Johan Hovold <johan@kernel.org>
> ---
>  drivers/mailbox/mailbox-th1520.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/mailbox/mailbox-th1520.c b/drivers/mailbox/mailbox-th1520.c
> index a6b2aa9ae952..626957c2e435 100644
> --- a/drivers/mailbox/mailbox-th1520.c
> +++ b/drivers/mailbox/mailbox-th1520.c
> @@ -435,10 +435,8 @@ static int th1520_mbox_probe(struct platform_device *pdev)
>  	}
>  
>  	ret = devm_add_action_or_reset(dev, th1520_disable_clk, priv);
> -	if (ret) {
> -		clk_bulk_disable_unprepare(ARRAY_SIZE(priv->clocks), priv->clocks);
> +	if (ret)
>  		return ret;
> -	}
>  
>  	/*
>  	 * The address mappings in the device tree align precisely with those

Hi,
Thanks for your fix. I believe it is correct as devm_add_action_or_reset
will call th1520_disable_clk on failure, like you noticed.

Reviewed-by: Michal Wilczynski <m.wilczynski@samsung.com>

Best regards,
-- 
Michal Wilczynski <m.wilczynski@samsung.com>

Re: [PATCH] mailbox: th1520: fix clock imbalance on probe failure

[Johan Hovold]

On Fri, Oct 17, 2025 at 07:54:14AM +0200, Johan Hovold wrote:
> The purpose of the devm_add_action_or_reset() helper is to call the
> action function in case adding an action ever fails so drop the clock
> disable from the error path to avoid disabling the clocks twice.
> 
> Fixes: 5d4d263e1c6b ("mailbox: Introduce support for T-head TH1520 Mailbox driver")
> Cc: Michal Wilczynski <m.wilczynski@samsung.com>
> Signed-off-by: Johan Hovold <johan@kernel.org>
> ---

Can this one be picked up for 6.19?

Johan

Re: [PATCH] mailbox: th1520: fix clock imbalance on probe failure

[Johan Hovold]

On Mon, Nov 10, 2025 at 10:13:38AM +0100, Johan Hovold wrote:
> On Fri, Oct 17, 2025 at 07:54:14AM +0200, Johan Hovold wrote:
> > The purpose of the devm_add_action_or_reset() helper is to call the
> > action function in case adding an action ever fails so drop the clock
> > disable from the error path to avoid disabling the clocks twice.
> > 
> > Fixes: 5d4d263e1c6b ("mailbox: Introduce support for T-head TH1520 Mailbox driver")
> > Cc: Michal Wilczynski <m.wilczynski@samsung.com>
> > Signed-off-by: Johan Hovold <johan@kernel.org>
> > ---
> 
> Can this one be picked up for 6.19?

It's been another month so sending another reminder. Can this one be
picked up for 6.19?

Johan

Re: [PATCH] mailbox: th1520: fix clock imbalance on probe failure

[Drew Fustini]

On Wed, Nov 26, 2025 at 05:24:05PM +0100, Johan Hovold wrote:
> On Mon, Nov 10, 2025 at 10:13:38AM +0100, Johan Hovold wrote:
> > On Fri, Oct 17, 2025 at 07:54:14AM +0200, Johan Hovold wrote:
> > > The purpose of the devm_add_action_or_reset() helper is to call the
> > > action function in case adding an action ever fails so drop the clock
> > > disable from the error path to avoid disabling the clocks twice.
> > > 
> > > Fixes: 5d4d263e1c6b ("mailbox: Introduce support for T-head TH1520 Mailbox driver")
> > > Cc: Michal Wilczynski <m.wilczynski@samsung.com>
> > > Signed-off-by: Johan Hovold <johan@kernel.org>
> > > ---
> > 
> > Can this one be picked up for 6.19?
> 
> It's been another month so sending another reminder. Can this one be
> picked up for 6.19?
> 
> Johan

It looks like this is now in the 6.18-rc7 PR from Jassi :)

https://lore.kernel.org/all/CABb+yY2GeWHWeASzemit8XvgvHg=Cse+46CqF3KJfsBXNPEBAw@mail.gmail.com/

-Drew

Re: [PATCH] mailbox: th1520: fix clock imbalance on probe failure

[Johan Hovold]

On Sat, Nov 29, 2025 at 08:44:51AM -0800, Drew Fustini wrote:
> On Wed, Nov 26, 2025 at 05:24:05PM +0100, Johan Hovold wrote:
> > On Mon, Nov 10, 2025 at 10:13:38AM +0100, Johan Hovold wrote:
> > > On Fri, Oct 17, 2025 at 07:54:14AM +0200, Johan Hovold wrote:
> > > > The purpose of the devm_add_action_or_reset() helper is to call the
> > > > action function in case adding an action ever fails so drop the clock
> > > > disable from the error path to avoid disabling the clocks twice.
> > > > 
> > > > Fixes: 5d4d263e1c6b ("mailbox: Introduce support for T-head TH1520 Mailbox driver")
> > > > Cc: Michal Wilczynski <m.wilczynski@samsung.com>
> > > > Signed-off-by: Johan Hovold <johan@kernel.org>
> > > > ---
> > > 
> > > Can this one be picked up for 6.19?
> > 
> > It's been another month so sending another reminder. Can this one be
> > picked up for 6.19?

> It looks like this is now in the 6.18-rc7 PR from Jassi :)
> 
> https://lore.kernel.org/all/CABb+yY2GeWHWeASzemit8XvgvHg=Cse+46CqF3KJfsBXNPEBAw@mail.gmail.com/

Yes, indeed, it made it into 6.18. Thanks!

Johan

Re: [PATCH] mailbox: th1520: fix clock imbalance on probe failure

[Drew Fustini]

On Fri, Oct 17, 2025 at 07:54:14AM +0200, Johan Hovold wrote:
> The purpose of the devm_add_action_or_reset() helper is to call the
> action function in case adding an action ever fails so drop the clock
> disable from the error path to avoid disabling the clocks twice.
> 
> Fixes: 5d4d263e1c6b ("mailbox: Introduce support for T-head TH1520 Mailbox driver")
> Cc: Michal Wilczynski <m.wilczynski@samsung.com>
> Signed-off-by: Johan Hovold <johan@kernel.org>
> ---
>  drivers/mailbox/mailbox-th1520.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/mailbox/mailbox-th1520.c b/drivers/mailbox/mailbox-th1520.c
> index a6b2aa9ae952..626957c2e435 100644
> --- a/drivers/mailbox/mailbox-th1520.c
> +++ b/drivers/mailbox/mailbox-th1520.c
> @@ -435,10 +435,8 @@ static int th1520_mbox_probe(struct platform_device *pdev)
>  	}
>  
>  	ret = devm_add_action_or_reset(dev, th1520_disable_clk, priv);
> -	if (ret) {
> -		clk_bulk_disable_unprepare(ARRAY_SIZE(priv->clocks), priv->clocks);
> +	if (ret)
>  		return ret;
> -	}
>  
>  	/*
>  	 * The address mappings in the device tree align precisely with those
> -- 
> 2.49.1
> 

Acked-by: Drew Fustini <fustini@kernel.org>

Jassi - are you able to take this through your mailbox tree?

Thanks,
Drew