diff options
| author | Tero Kristo <t-kristo@ti.com> | 2020-07-17 16:29:58 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-21 13:15:15 +0200 |
| commit | f4c223e3941bd0737fe019e1db85b5f298ac1163 (patch) | |
| tree | 0683ff4c97075bcfabf46f45bf717e04b86324d2 | |
| parent | 6a35f55743e0c25ff5ca96162482fd36a75e1b8e (diff) | |
| download | linux-stable-f4c223e3941bd0737fe019e1db85b5f298ac1163.tar.gz linux-stable-f4c223e3941bd0737fe019e1db85b5f298ac1163.tar.bz2 linux-stable-f4c223e3941bd0737fe019e1db85b5f298ac1163.zip | |
watchdog: rti-wdt: balance pm runtime enable calls
[ Upstream commit d5b29c2c5ba2bd5bbdb5b744659984185d17d079 ]
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 <t-kristo@ti.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20200717132958.14304-5-t-kristo@ti.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/watchdog/rti_wdt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c index d456dd72d99a..c904496fff65 100644 --- a/drivers/watchdog/rti_wdt.c +++ b/drivers/watchdog/rti_wdt.c @@ -211,6 +211,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; } @@ -221,6 +222,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; } |