Commit f61a59ac authored by Lingling Xu's avatar Lingling Xu Committed by Wim Van Sebroeck

watchdog: sprd: remove watchdog disable from resume fail path

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: 47760346 ("watchdog: Add Spreadtrum watchdog driver")
Signed-off-by: default avatarLingling Xu <ling_ling.xu@unisoc.com>
Signed-off-by: default avatarChunyan Zhang <chunyan.zhang@unisoc.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20201029023933.24548-2-zhang.lyra@gmail.comSigned-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent 8ae25111
...@@ -345,15 +345,10 @@ static int __maybe_unused sprd_wdt_pm_resume(struct device *dev) ...@@ -345,15 +345,10 @@ static int __maybe_unused sprd_wdt_pm_resume(struct device *dev)
if (ret) if (ret)
return ret; return ret;
if (watchdog_active(&wdt->wdd)) { if (watchdog_active(&wdt->wdd))
ret = sprd_wdt_start(&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 = { static const struct dev_pm_ops sprd_wdt_pm_ops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment