From: Chunyan Zhang <zhang.lyra@gmail.com>
To: Wim Van Sebroeck <wim@linux-watchdog.org>,
Guenter Roeck <linux@roeck-us.net>
Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org,
Orson Zhai <orsonzhai@gmail.com>,
Baolin Wang <baolin.wang7@gmail.com>,
Chunyan Zhang <zhang.lyra@gmail.com>,
Chunyan Zhang <chunyan.zhang@unisoc.com>
Subject: [PATCH 1/3] watchdog: sprd: should not disable watchdog in resume
Date: Mon, 26 Oct 2020 16:09:17 +0800 [thread overview]
Message-ID: <20201026080919.28413-2-zhang.lyra@gmail.com> (raw)
In-Reply-To: <20201026080919.28413-1-zhang.lyra@gmail.com>
From: Lingling Xu <ling_ling.xu@unisoc.com>
Don't disable watchdog in resume process, otherwise system would crash
once kick watchdog.
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>
---
drivers/watchdog/sprd_wdt.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/watchdog/sprd_wdt.c b/drivers/watchdog/sprd_wdt.c
index 65cb55f3916f..f3c90b4afead 100644
--- a/drivers/watchdog/sprd_wdt.c
+++ b/drivers/watchdog/sprd_wdt.c
@@ -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 = {
--
2.20.1
next prev parent reply other threads:[~2020-10-26 8:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-26 8:09 [PATCH 0/3] A few fixes to sprd watchdog driver Chunyan Zhang
2020-10-26 8:09 ` Chunyan Zhang [this message]
2020-10-26 14:27 ` [PATCH 1/3] watchdog: sprd: should not disable watchdog in resume Guenter Roeck
2020-10-27 9:34 ` Chunyan Zhang
2020-10-26 8:09 ` [PATCH 2/3] watchdog: sprd: change timeout value from 1000 to 2000 Chunyan Zhang
2020-10-26 14:36 ` Guenter Roeck
2020-10-27 9:21 ` Chunyan Zhang
2020-10-26 8:09 ` [PATCH 3/3] watchdog: sprd: check busy bit before kick watchdog Chunyan Zhang
2020-10-26 14:44 ` Guenter Roeck
2020-10-27 9:17 ` Chunyan Zhang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201026080919.28413-2-zhang.lyra@gmail.com \
--to=zhang.lyra@gmail.com \
--cc=baolin.wang7@gmail.com \
--cc=chunyan.zhang@unisoc.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=orsonzhai@gmail.com \
--cc=wim@linux-watchdog.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).