aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2011-09-16 05:57:01 +0000
committerXin LI <delphij@FreeBSD.org>2011-09-16 05:57:01 +0000
commit6056afe4069d814a416d75dc6e3f8a40ecd59f81 (patch)
treeaa486874b6bd9452800aa135fd5894be23e50015
parenta0442997a6d8cb081202e0dee673e9679056784c (diff)
Notes
-rw-r--r--sys/dev/ichwd/ichwd.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/ichwd/ichwd.c b/sys/dev/ichwd/ichwd.c
index 1775afcd6606..727012adbba1 100644
--- a/sys/dev/ichwd/ichwd.c
+++ b/sys/dev/ichwd/ichwd.c
@@ -402,11 +402,10 @@ ichwd_event(void *arg, unsigned int cmd, int *error)
cmd &= WD_INTERVAL;
timeout = ((uint64_t)1 << cmd) / ICHWD_TICK;
if (cmd) {
- if (timeout != sc->timeout) {
- if (!sc->active)
- ichwd_tmr_enable(sc);
+ if (!sc->active)
+ ichwd_tmr_enable(sc);
+ if (timeout != sc->timeout)
ichwd_tmr_set(sc, timeout);
- }
ichwd_tmr_reload(sc);
*error = 0;
} else {