From owner-svn-src-all@FreeBSD.ORG  Tue Jun 22 07:52:58 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6B5E3106564A;
	Tue, 22 Jun 2010 07:52:58 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5A14E8FC1C;
	Tue, 22 Jun 2010 07:52:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5M7qwDi080110;
	Tue, 22 Jun 2010 07:52:58 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5M7qwJ1080108;
	Tue, 22 Jun 2010 07:52:58 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201006220752.o5M7qwJ1080108@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Tue, 22 Jun 2010 07:52:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209416 - stable/7/sys/dev/amdsbwd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Jun 2010 07:52:58 -0000

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)