devm_add_action_or_reset() already calls the action in the error case.
Reported-by: Uwe Kleine-König <[email protected]>
Closes: https://lore.kernel.org/linux-pwm/fuku3b5ur6y4k4refd3vmeoenzjo6mwe3b3gtel34rhhhtvnsa@w4uktgbqsc3w/
Fixes: fcc760729359 ("pwm: bcm2835: Allow PWM driver to be used in atomic context")
Signed-off-by: Sean Young <[email protected]>
Reviewed-by: Uwe Kleine-König <[email protected]>
---
drivers/pwm/pwm-bcm2835.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/pwm/pwm-bcm2835.c b/drivers/pwm/pwm-bcm2835.c
index 307c0bd5f885..283cf27f25ba 100644
--- a/drivers/pwm/pwm-bcm2835.c
+++ b/drivers/pwm/pwm-bcm2835.c
@@ -160,10 +160,8 @@ static int bcm2835_pwm_probe(struct platform_device *pdev)
ret = devm_add_action_or_reset(&pdev->dev, devm_clk_rate_exclusive_put,
pc->clk);
- if (ret) {
- clk_rate_exclusive_put(pc->clk);
+ if (ret)
return ret;
- }
pc->rate = clk_get_rate(pc->clk);
if (!pc->rate)
--
2.43.0
On 12/22/2023 2:13 PM, Sean Young wrote:
> devm_add_action_or_reset() already calls the action in the error case.
>
> Reported-by: Uwe Kleine-König <[email protected]>
> Closes: https://lore.kernel.org/linux-pwm/fuku3b5ur6y4k4refd3vmeoenzjo6mwe3b3gtel34rhhhtvnsa@w4uktgbqsc3w/
> Fixes: fcc760729359 ("pwm: bcm2835: Allow PWM driver to be used in atomic context")
> Signed-off-by: Sean Young <[email protected]>
> Reviewed-by: Uwe Kleine-König <[email protected]>
Reviewed-by: Florian Fainelli <[email protected]>
--
Florian
Hello Thierry,
On Fri, Dec 22, 2023 at 01:13:11PM +0000, Sean Young wrote:
> devm_add_action_or_reset() already calls the action in the error case.
>
> Reported-by: Uwe Kleine-K?nig <[email protected]>
> Closes: https://lore.kernel.org/linux-pwm/fuku3b5ur6y4k4refd3vmeoenzjo6mwe3b3gtel34rhhhtvnsa@w4uktgbqsc3w/
> Fixes: fcc760729359 ("pwm: bcm2835: Allow PWM driver to be used in atomic context")
> Signed-off-by: Sean Young <[email protected]>
> Reviewed-by: Uwe Kleine-K?nig <[email protected]>
> ---
> drivers/pwm/pwm-bcm2835.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/pwm/pwm-bcm2835.c b/drivers/pwm/pwm-bcm2835.c
> index 307c0bd5f885..283cf27f25ba 100644
> --- a/drivers/pwm/pwm-bcm2835.c
> +++ b/drivers/pwm/pwm-bcm2835.c
> @@ -160,10 +160,8 @@ static int bcm2835_pwm_probe(struct platform_device *pdev)
>
> ret = devm_add_action_or_reset(&pdev->dev, devm_clk_rate_exclusive_put,
> pc->clk);
> - if (ret) {
> - clk_rate_exclusive_put(pc->clk);
> + if (ret)
> return ret;
> - }
>
> pc->rate = clk_get_rate(pc->clk);
> if (!pc->rate)
this patch should be added to your for-next branch and then your PR for
the next merge window.
Also "pwm: linux/pwm.h: fix Excess kernel-doc description warning"
(Message-Id: [email protected]) should be
added IMHO.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | https://www.pengutronix.de/ |
Hello,
On Wed, Jan 03, 2024 at 01:28:25PM +0100, Uwe Kleine-K?nig wrote:
> this patch should be added to your for-next branch and then your PR for
> the next merge window.
This was missed for the pwm/for-6.8-rc1 PR. I added it to my for-next
branch at
https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/for-next
now with the intention to send it for inclusion in 6.8-rc after being in
next for a few days.
> Also "pwm: linux/pwm.h: fix Excess kernel-doc description warning"
> (Message-Id: [email protected]) should be
> added IMHO.
This one was already cared for.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | https://www.pengutronix.de/ |