svn commit: r209416 - stable/7/sys/dev/amdsbwd
Andriy Gapon
avg at FreeBSD.org
Tue Jun 22 07:52:58 UTC 2010
Author: avg
Date: Tue Jun 22 07:52:58 2010
New Revision: 209416
URL: http://svn.freebsd.org/changeset/base/209416
Log:
MFC r208670: amdsbwd: fix nonsensical timeout calculations
Modified:
stable/7/sys/dev/amdsbwd/amdsbwd.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/dev/amdsbwd/amdsbwd.c
==============================================================================
--- stable/7/sys/dev/amdsbwd/amdsbwd.c Tue Jun 22 07:46:54 2010 (r209415)
+++ stable/7/sys/dev/amdsbwd/amdsbwd.c Tue Jun 22 07:52:58 2010 (r209416)
@@ -230,10 +230,10 @@ amdsbwd_event(void *arg, unsigned int cm
cmd &= WD_INTERVAL;
if (cmd < WD_TO_1SEC)
cmd = 0;
- timeout = ((uint64_t)1 << (cmd - WD_TO_1MS)) / sc->ms_per_tick;
- if (timeout > sc->max_ticks)
- timeout = sc->max_ticks;
if (cmd) {
+ timeout = ((uint64_t)1 << (cmd - WD_TO_1MS)) / sc->ms_per_tick;
+ if (timeout > sc->max_ticks)
+ timeout = sc->max_ticks;
if (timeout != sc->timeout) {
amdsbwd_tmr_set(sc, timeout);
if (!sc->active)
More information about the svn-src-stable
mailing list