From owner-svn-src-all@FreeBSD.ORG  Tue Jun 21 20:51:10 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 03D2A1065692;
	Tue, 21 Jun 2011 20:51:10 +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 E89A78FC0C;
	Tue, 21 Jun 2011 20:51:09 +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 p5LKp9A0016462;
	Tue, 21 Jun 2011 20:51:09 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5LKp9xX016460;
	Tue, 21 Jun 2011 20:51:09 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201106212051.p5LKp9xX016460@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 21 Jun 2011 20:51:09 +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: r223380 - head/sys/dev/xl
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:51:10 -0000

Author: imp
Date: Tue Jun 21 20:51:09 2011
New Revision: 223380
URL: http://svn.freebsd.org/changeset/base/223380

Log:
  Supress warning that command didn't complete when the parent bus
  thinks the card is gone.

Modified:
  head/sys/dev/xl/if_xl.c

Modified: head/sys/dev/xl/if_xl.c
==============================================================================
--- head/sys/dev/xl/if_xl.c	Tue Jun 21 20:50:55 2011	(r223379)
+++ head/sys/dev/xl/if_xl.c	Tue Jun 21 20:51:09 2011	(r223380)
@@ -334,7 +334,7 @@ xl_dma_map_addr(void *arg, bus_dma_segme
  * only a finite amount of time to avoid getting caught in an
  * infinite loop. Normally this delay routine would be a macro,
  * but it isn't called during normal operation so we can afford
- * to make it a function.
+ * to make it a function.  Spress warning when card gone.
  */
 static void
 xl_wait(struct xl_softc *sc)
@@ -346,7 +346,7 @@ xl_wait(struct xl_softc *sc)
 			break;
 	}
 
-	if (i == XL_TIMEOUT)
+	if (i == XL_TIMEOUT && bus_child_present(sc->xl_dev))
 		device_printf(sc->xl_dev, "command never completed!\n");
 }