From owner-p4-projects@FreeBSD.ORG  Mon Dec 17 14:58:08 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0778116A46B; Mon, 17 Dec 2007 14:58:08 +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 8897F16A417
	for <perforce@FreeBSD.org>; Mon, 17 Dec 2007 14:58:07 +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 6A3B313C448
	for <perforce@FreeBSD.org>; Mon, 17 Dec 2007 14:58:07 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBHEw7g0061124
	for <perforce@FreeBSD.org>; Mon, 17 Dec 2007 14:58:07 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBHEw7H8061121
	for perforce@freebsd.org; Mon, 17 Dec 2007 14:58:07 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 17 Dec 2007 14:58:07 GMT
Message-Id: <200712171458.lBHEw7H8061121@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 131099 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: Mon, 17 Dec 2007 14:58:08 -0000

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

Change 131099 by hselasky@hselasky_laptop001 on 2007/12/17 14:57:30

	
	Exclude Giant from an assert.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#73 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#73 (text+ko) ====

@@ -1993,7 +1993,9 @@
 		/* transfer is gone */
 		return;
 	}
+	if (xfer->priv_mtx != &Giant) {
 	mtx_assert(xfer->priv_mtx, MA_NOTOWNED);
+	}
 
 	mtx_lock(xfer->priv_mtx);