From owner-p4-projects@FreeBSD.ORG  Sat Jan 24 10:13:30 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3957C1065670; Sat, 24 Jan 2009 10:13:30 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EBC18106564A
	for <perforce@FreeBSD.org>; Sat, 24 Jan 2009 10:13:29 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DA48B8FC0A
	for <perforce@FreeBSD.org>; Sat, 24 Jan 2009 10:13:29 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0OADTGF044321
	for <perforce@FreeBSD.org>; Sat, 24 Jan 2009 10:13:29 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0OADTvb044319
	for perforce@freebsd.org; Sat, 24 Jan 2009 10:13:29 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 24 Jan 2009 10:13:29 GMT
Message-Id: <200901241013.n0OADTvb044319@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 156600 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Jan 2009 10:13:31 -0000

http://perforce.freebsd.org/chv.cgi?CH=156600

Change 156600 by hselasky@hselasky_laptop001 on 2009/01/24 10:12:35

	
	Revert last USB bluetooth change. It is not
	correct. Print out node refs outstanding in
	detach so that we don't get into any trouble!

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#19 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#19 (text+ko) ====

@@ -595,8 +595,14 @@
 	/* Free USB transfers, if any */
 	usb2_transfer_unsetup(sc->sc_xfer, UBT_N_TRANSFER);
 
-	if (node != NULL)
+	if (node != NULL) {
+		if (node->nd_refs != 1) {
+			device_printf(dev, "WARNING: Node "
+			    "reference(%d) is not one!\n",
+			    (int)(node->nd_refs));
+		}
 		NG_NODE_UNREF(node);
+	}
 
 	/* Destroy queues */
 	UBT_LOCK(sc);
@@ -1292,7 +1298,6 @@
 		UBT_UNLOCK(sc);
 
 		NG_NODE_SET_PRIVATE(node, NULL);
-		NG_NODE_UNREF(node);
 	} else
 		NG_NODE_REVIVE(node); /* tell ng_rmnode we are persisant */