svn commit: r223381 - head/sys/dev/dc

Warner Losh imp at FreeBSD.org
Tue Jun 21 20:52:55 UTC 2011


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__);


More information about the svn-src-head mailing list