2020-07-03 12:08:53

by Tero Kristo

[permalink] [raw]
Subject: [PATCHv2 5/5] watchdog: rti-wdt: balance pm runtime enable calls

PM runtime should be disabled in the fail path of probe and when
the driver is removed.

Fixes: 2d63908bdbfb ("watchdog: Add K3 RTI watchdog support")
Signed-off-by: Tero Kristo <[email protected]>
---
drivers/watchdog/rti_wdt.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c
index 987e5a798cb4..7007445da80b 100644
--- a/drivers/watchdog/rti_wdt.c
+++ b/drivers/watchdog/rti_wdt.c
@@ -304,6 +304,7 @@ static int rti_wdt_probe(struct platform_device *pdev)

err_iomap:
pm_runtime_put_sync(&pdev->dev);
+ pm_runtime_disable(&pdev->dev);

return ret;
}
@@ -314,6 +315,7 @@ static int rti_wdt_remove(struct platform_device *pdev)

watchdog_unregister_device(&wdt->wdd);
pm_runtime_put(&pdev->dev);
+ pm_runtime_disable(&pdev->dev);

return 0;
}
--
2.17.1

--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki


2020-07-05 15:09:09

by Guenter Roeck

[permalink] [raw]
Subject: Re: [PATCHv2 5/5] watchdog: rti-wdt: balance pm runtime enable calls

On 7/3/20 5:04 AM, Tero Kristo wrote:
> PM runtime should be disabled in the fail path of probe and when
> the driver is removed.
>
> Fixes: 2d63908bdbfb ("watchdog: Add K3 RTI watchdog support")
> Signed-off-by: Tero Kristo <[email protected]>

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

> ---
> drivers/watchdog/rti_wdt.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c
> index 987e5a798cb4..7007445da80b 100644
> --- a/drivers/watchdog/rti_wdt.c
> +++ b/drivers/watchdog/rti_wdt.c
> @@ -304,6 +304,7 @@ static int rti_wdt_probe(struct platform_device *pdev)
>
> err_iomap:
> pm_runtime_put_sync(&pdev->dev);
> + pm_runtime_disable(&pdev->dev);
>
> return ret;
> }
> @@ -314,6 +315,7 @@ static int rti_wdt_remove(struct platform_device *pdev)
>
> watchdog_unregister_device(&wdt->wdd);
> pm_runtime_put(&pdev->dev);
> + pm_runtime_disable(&pdev->dev);
>
> return 0;
> }
>