From owner-svn-src-head@FreeBSD.ORG  Tue Jun 21 03:08:00 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 25F48106566C;
	Tue, 21 Jun 2011 03:08:00 +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 1649F8FC18;
	Tue, 21 Jun 2011 03:08:00 +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 p5L37x7q076765;
	Tue, 21 Jun 2011 03:07:59 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5L37xG9076762;
	Tue, 21 Jun 2011 03:07:59 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201106210307.p5L37xG9076762@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 21 Jun 2011 03:07:59 +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: r223353 - head/sys/dev/firewire
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2011 03:08:00 -0000

Author: imp
Date: Tue Jun 21 03:07:59 2011
New Revision: 223353
URL: http://svn.freebsd.org/changeset/base/223353

Log:
  When we see an interrupt status of 0xffffffff, check to see if the
  child is still present.  If not, return 'handled' and don't print
  anything (this is expected behavior).  We expect an interrupt on eject,
  power-down and/or shutdown.

Modified:
  head/sys/dev/firewire/fwohci.c

Modified: head/sys/dev/firewire/fwohci.c
==============================================================================
--- head/sys/dev/firewire/fwohci.c	Tue Jun 21 03:05:17 2011	(r223352)
+++ head/sys/dev/firewire/fwohci.c	Tue Jun 21 03:07:59 2011	(r223353)
@@ -2072,8 +2072,9 @@ fwohci_check_stat(struct fwohci_softc *s
 	FW_GLOCK_ASSERT(&sc->fc);
 	stat = OREAD(sc, FWOHCI_INTSTAT);
 	if (stat == 0xffffffff) {
-		device_printf(sc->fc.dev, 
-			"device physically ejected?\n");
+		if (!bus_child_present(sc->fc.dev))
+			return (FILTER_HANDLED);
+		device_printf(sc->fc.dev, "device physically ejected?\n");
 		return (FILTER_STRAY);
 	}
 	if (stat)