2024-01-19 10:05:01

by Ji Sheng Teoh

Subject: [PATCH] watchdog: starfive: Check pm_runtime_enabled() before decrementing usage counter

In the probe function, pm_runtime_put_sync() will fail on platform with
runtime PM disabled.
Check if runtime PM is enabled before calling pm_runtime_put_sync() to
fix it.

Fixes: db728ea9c7be ("drivers: watchdog: Add StarFive Watchdog driver")
Signed-off-by: Xingyu Wu <[email protected]>
Signed-off-by: Ley Foon Tan <[email protected]>
Signed-off-by: Ji Sheng Teoh <[email protected]>
---
drivers/watchdog/starfive-wdt.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.c
index e28ead24c520..df68ae4acbd7 100644
--- a/drivers/watchdog/starfive-wdt.c
+++ b/drivers/watchdog/starfive-wdt.c
@@ -494,8 +494,13 @@ static int starfive_wdt_probe(struct platform_device *pdev)
if (ret)
goto err_exit;

- if (!early_enable)
- pm_runtime_put_sync(&pdev->dev);
+ if (!early_enable) {
+ if (pm_runtime_enabled(&pdev->dev)) {
+ ret = pm_runtime_put_sync(&pdev->dev);
+ if (ret)
+ goto err_exit;
+ }
+ }

return 0;

--
2.43.0

2024-01-19 12:53:33

by Guenter Roeck

Subject: Re: [PATCH] watchdog: starfive: Check pm_runtime_enabled() before decrementing usage counter

On 1/19/24 00:27, Ji Sheng Teoh wrote:
> In the probe function, pm_runtime_put_sync() will fail on platform with
> runtime PM disabled.
> Check if runtime PM is enabled before calling pm_runtime_put_sync() to
> fix it.
>
> Fixes: db728ea9c7be ("drivers: watchdog: Add StarFive Watchdog driver")
> Signed-off-by: Xingyu Wu <[email protected]>
> Signed-off-by: Ley Foon Tan <[email protected]>
> Signed-off-by: Ji Sheng Teoh <[email protected]>

Reviewed-by: Guenter Roeck <[email protected]>

Guenter

> ---
> drivers/watchdog/starfive-wdt.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.c
> index e28ead24c520..df68ae4acbd7 100644
> --- a/drivers/watchdog/starfive-wdt.c
> +++ b/drivers/watchdog/starfive-wdt.c
> @@ -494,8 +494,13 @@ static int starfive_wdt_probe(struct platform_device *pdev)
> if (ret)
> goto err_exit;
>
> - if (!early_enable)
> - pm_runtime_put_sync(&pdev->dev);
> + if (!early_enable) {
> + if (pm_runtime_enabled(&pdev->dev)) {
> + ret = pm_runtime_put_sync(&pdev->dev);
> + if (ret)
> + goto err_exit;
> + }
> + }
>
> return 0;
>