From: Guenter Roeck <linux@roeck-us.net>
To: linux-watchdog@vger.kernel.org
Cc: Wim Van Sebroeck <wim@iguana.be>,
linux-kernel@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>
Subject: [PATCH v3 8/8] watchdog: w83627hf_wdt: Reset watchdog trigger during initialization
Date: Sat, 17 Aug 2013 13:58:46 -0700 [thread overview]
Message-ID: <1376773126-2717-9-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1376773126-2717-1-git-send-email-linux@roeck-us.net>
If the watchdog has already triggered for whatever reason, it won't restart
unless the trigger is reset.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
drivers/watchdog/w83627hf_wdt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
index 4c9f27a..5979c1c 100644
--- a/drivers/watchdog/w83627hf_wdt.c
+++ b/drivers/watchdog/w83627hf_wdt.c
@@ -211,8 +211,8 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
t = superio_inb(cr_wdt_control) & ~0x0C;
superio_outb(cr_wdt_control, t);
- /* disable keyboard & mouse turning off watchdog */
- t = superio_inb(0xF7) & ~0xC0;
+ /* reset trigger, disable keyboard & mouse turning off watchdog */
+ t = superio_inb(0xF7) & ~0xD0;
superio_outb(0xF7, t);
superio_exit();
--
1.7.9.7
prev parent reply other threads:[~2013-08-17 20:59 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-17 20:58 [PATCH v3 0/8] watchdog: w83627hf: Convert to watchdog infrastructure Guenter Roeck
2013-08-17 20:58 ` [PATCH v3 1/8] " Guenter Roeck
2013-09-29 4:01 ` Pádraig Brady
2013-09-30 20:40 ` Guenter Roeck
2013-10-28 21:57 ` Wim Van Sebroeck
2013-10-28 23:10 ` Guenter Roeck
2013-10-29 2:43 ` [PATCH v4] " Guenter Roeck
2013-10-29 6:34 ` Wim Van Sebroeck
2013-11-17 19:12 ` Wim Van Sebroeck
2013-11-17 21:21 ` Guenter Roeck
2013-08-17 20:58 ` [PATCH v3 2/8] watchdog: w83627hf: Enable watchdog only once Guenter Roeck
2013-08-17 20:58 ` [PATCH v3 3/8] watchdog: w83627hf: Enable watchdog device only if not already enabled Guenter Roeck
2013-08-17 20:58 ` [PATCH v3 4/8] watchdog: w83627hf: Use helper functions to access superio registers Guenter Roeck
2013-08-17 20:58 ` [PATCH v3 5/8] watchdog: w83627hf: Auto-detect IO address and supported chips Guenter Roeck
2013-08-17 20:58 ` [PATCH v3 6/8] watchdog: w83627hf: Add support for W83697HF and W83697UG Guenter Roeck
2013-08-17 20:58 ` [PATCH v3 7/8] watchdog: Remove drivers " Guenter Roeck
2013-08-17 20:58 ` Guenter Roeck [this message]
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=1376773126-2717-9-git-send-email-linux@roeck-us.net \
--to=linux@roeck-us.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=wim@iguana.be \
/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).