Skip to content

Commit

Permalink
watchdog: sprd: remove watchdog disable from resume fail path
Browse files Browse the repository at this point in the history
[ Upstream commit f61a59a ]

sprd_wdt_start() would return fail if the loading operation is not completed
in a certain time, disabling watchdog for that case would probably cause
the kernel crash when kick watchdog later, that's too bad, so remove the
watchdog disable operation for the fail case to make sure other parts in
the kernel can run normally.

[ chunyan: Massaged changelog ]

Fixes: 4776034 ("watchdog: Add Spreadtrum watchdog driver")
Signed-off-by: Lingling Xu <ling_ling.xu@unisoc.com>
Signed-off-by: Chunyan Zhang <chunyan.zhang@unisoc.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20201029023933.24548-2-zhang.lyra@gmail.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>
  • Loading branch information
Lingling Xu authored and gregkh committed Dec 30, 2020
1 parent 2d42e03 commit f71f75a
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions drivers/watchdog/sprd_wdt.c
Expand Up @@ -345,15 +345,10 @@ static int __maybe_unused sprd_wdt_pm_resume(struct device *dev)
if (ret)
return ret;

if (watchdog_active(&wdt->wdd)) {
if (watchdog_active(&wdt->wdd))
ret = sprd_wdt_start(&wdt->wdd);
if (ret) {
sprd_wdt_disable(wdt);
return ret;
}
}

return 0;
return ret;
}

static const struct dev_pm_ops sprd_wdt_pm_ops = {
Expand Down

0 comments on commit f71f75a

Please sign in to comment.