watchdog: sprd: remove watchdog disable from resume fail path

[ Upstream commit f61a59acb462840bebcc192f754fe71b6a16ff99 ]

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: 477603467009 ("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>

diff --git a/drivers/watchdog/sprd_wdt.c b/drivers/watchdog/sprd_wdt.c
index b6c65afd3677876eeaeb85e5ea13f7611949e021..ffe0346c5d0ebb010563e097f9f1499436053caa 100644 (file)
--- a/drivers/watchdog/sprd_wdt.c
+++ b/drivers/watchdog/sprd_wdt.c
@@ -360,15 +360,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 = {