From owner-svn-src-all@FreeBSD.ORG  Mon Apr 25 14:12:58 2011
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 736C61065676;
	Mon, 25 Apr 2011 14:12:58 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 645638FC12;
	Mon, 25 Apr 2011 14:12:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p3PECw3Q079425;
	Mon, 25 Apr 2011 14:12:58 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3PECwb4079423;
	Mon, 25 Apr 2011 14:12:58 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201104251412.p3PECwb4079423@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Mon, 25 Apr 2011 14:12:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221016 - head/sys/dev/ichwd
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: Mon, 25 Apr 2011 14:12:58 -0000

Author: attilio
Date: Mon Apr 25 14:12:58 2011
New Revision: 221016
URL: http://svn.freebsd.org/changeset/base/221016

Log:
  Add missing bit in r221015.
  
  Sponsored by:	Sandvine Incorporated
  Reviewed by:	des
  MFC after:	1 week
  X-MFC:		r221015

Modified:
  head/sys/dev/ichwd/ichwd.c

Modified: head/sys/dev/ichwd/ichwd.c
==============================================================================
--- head/sys/dev/ichwd/ichwd.c	Mon Apr 25 14:10:33 2011	(r221015)
+++ head/sys/dev/ichwd/ichwd.c	Mon Apr 25 14:12:58 2011	(r221016)
@@ -217,6 +217,15 @@ ichwd_smi_enable(struct ichwd_softc *sc)
 }
 
 /*
+ * Check if the watchdog SMI triggering is enabled.
+ */
+static __inline int
+ichwd_smi_is_enabled(struct ichwd_softc *sc)
+{
+	return ((ichwd_read_smi_4(sc, SMI_EN) & SMI_TCO_EN) != 0);
+}
+
+/*
  * Reset the watchdog status bits.
  */
 static __inline void
@@ -534,6 +543,7 @@ ichwd_attach(device_t dev)
 	sc->ev_tag = EVENTHANDLER_REGISTER(watchdog_list, ichwd_event, sc, 0);
 
 	/* disable the SMI handler */
+	sc->smi_enabled = ichwd_smi_is_enabled(sc);
 	ichwd_smi_disable(sc);
 
 	return (0);
@@ -565,7 +575,8 @@ ichwd_detach(device_t dev)
 		ichwd_tmr_disable(sc);
 
 	/* enable the SMI handler */
-	ichwd_smi_enable(sc);
+	if (sc->smi_enabled != 0)
+		ichwd_smi_enable(sc);
 
 	/* deregister event handler */
 	if (sc->ev_tag != NULL)