summaryrefslogtreecommitdiffstats
path: root/sys/dev/ichwd/ichwd.c
diff options
context:
space:
mode:
authorn_hibma <n_hibma@FreeBSD.org>2007-03-13 15:54:26 +0000
committern_hibma <n_hibma@FreeBSD.org>2007-03-13 15:54:26 +0000
commit1deb546bd470554b2956dc67ab47c0e8a7971681 (patch)
tree0d2b1a137b623457f98c1f95aebe6be2d463ec20 /sys/dev/ichwd/ichwd.c
parent3228d5fc369fa854bc13c052cf78456c1c6911c8 (diff)
downloadFreeBSD-src-1deb546bd470554b2956dc67ab47c0e8a7971681.zip
FreeBSD-src-1deb546bd470554b2956dc67ab47c0e8a7971681.tar.gz
In one of the previous commits I accidentally removed the enabling of the
watchdog chip. Noticed by: Mike Tancsa Tested by: Mike Tancsa MFC after: 1 week
Diffstat (limited to 'sys/dev/ichwd/ichwd.c')
-rw-r--r--sys/dev/ichwd/ichwd.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/ichwd/ichwd.c b/sys/dev/ichwd/ichwd.c
index f878d39..a109f80 100644
--- a/sys/dev/ichwd/ichwd.c
+++ b/sys/dev/ichwd/ichwd.c
@@ -183,8 +183,11 @@ ichwd_event(void *arg, unsigned int cmd, int *error)
timeout = ((uint64_t)1 << cmd) / ICHWD_TICK;
if (cmd > 0 && cmd <= 63
&& timeout >= ICHWD_MIN_TIMEOUT && timeout <= ICHWD_MAX_TIMEOUT) {
- if (timeout != sc->timeout)
+ if (timeout != sc->timeout) {
+ if (!sc->active)
+ ichwd_tmr_enable(sc);
ichwd_tmr_set(sc, timeout);
+ }
ichwd_tmr_reload(sc);
*error = 0;
OpenPOWER on IntegriCloud