From owner-svn-src-all@FreeBSD.ORG  Tue Jun 21 20:52:55 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 9225510656D8;
	Tue, 21 Jun 2011 20:52:55 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 82E4A8FC1E;
	Tue, 21 Jun 2011 20:52:55 +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 p5LKqtGB016553;
	Tue, 21 Jun 2011 20:52:55 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5LKqtEF016551;
	Tue, 21 Jun 2011 20:52:55 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201106212052.p5LKqtEF016551@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 21 Jun 2011 20:52:55 +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: r223381 - head/sys/dev/dc
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, 21 Jun 2011 20:52:55 -0000

Author: imp
Date: Tue Jun 21 20:52:55 2011
New Revision: 223381
URL: http://svn.freebsd.org/changeset/base/223381

Log:
  Supress command completion failure warning when the card isn't
  present.  Only call the bus to check if we actually do timeout so we
  don't affect the normal case (since this case needn't be optimized and
  this guards against all races).

Modified:
  head/sys/dev/dc/if_dc.c

Modified: head/sys/dev/dc/if_dc.c
==============================================================================
--- head/sys/dev/dc/if_dc.c	Tue Jun 21 20:51:09 2011	(r223380)
+++ head/sys/dev/dc/if_dc.c	Tue Jun 21 20:52:55 2011	(r223381)
@@ -1385,7 +1385,7 @@ dc_netcfg_wait(struct dc_softc *sc)
 			break;
 		DELAY(10);
 	}
-	if (i == DC_TIMEOUT) {
+	if (i == DC_TIMEOUT && bus_child_present(sc->dc_dev)) {
 		if (!(isr & DC_ISR_TX_IDLE) && !DC_IS_ASIX(sc))
 			device_printf(sc->dc_dev,
 			    "%s: failed to force tx to idle state\n", __func__);