hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

watchdog: rzg2l_wdt: Check return status of pm_runtime_put()

Browse Source 
[ Upstream commit 471e45a33302852bf79bc140fe418782f50734f6 ]

pm_runtime_put() may return an error code. Check its return status.

Along with it the rzg2l_wdt_set_timeout() function was updated to
propagate the result of rzg2l_wdt_stop() to its caller.

Fixes: 2cbc5cd0b55f ("watchdog: Add Watchdog Timer driver for RZ/G2L")
Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20240531065723.1085423-5-claudiu.beznea.uj@bp.renesas.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>
This commit is contained in:
Claudiu Beznea 2024-05-31 09:57:18 +03:00 committed by Greg Kroah-Hartman
parent 6e6aa1b3f4
commit 1f1f444bfb
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/watchdog/rzg2l_wdt.c
View File

@ -144,9 +144,13 @@ static int rzg2l_wdt_start(struct watchdog_device *wdev)
static int rzg2l_wdt_stop(struct watchdog_device *wdev) static int rzg2l_wdt_stop(struct watchdog_device *wdev)
{ {
struct rzg2l_wdt_priv *priv = watchdog_get_drvdata(wdev); struct rzg2l_wdt_priv *priv = watchdog_get_drvdata(wdev);
int ret;
rzg2l_wdt_reset(priv); rzg2l_wdt_reset(priv);
pm_runtime_put(wdev->parent);
ret = pm_runtime_put(wdev->parent);
if (ret < 0)
return ret;
return 0; return 0;
} }
@ -163,7 +167,10 @@ static int rzg2l_wdt_set_timeout(struct watchdog_device *wdev, unsigned int time
* to reset the module) so that it is updated with new timeout values. * to reset the module) so that it is updated with new timeout values.
*/ */
if (watchdog_active(wdev)) { if (watchdog_active(wdev)) {
rzg2l_wdt_stop(wdev); ret = rzg2l_wdt_stop(wdev);
if (ret)
return ret;
ret = rzg2l_wdt_start(wdev); ret = rzg2l_wdt_start(wdev);
} }