From owner-p4-projects@FreeBSD.ORG  Fri Jan 18 21:45:43 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0775916A41A; Fri, 18 Jan 2008 21:45:43 +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 A7B1416A417
	for <perforce@FreeBSD.org>; Fri, 18 Jan 2008 21:45:42 +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 8E0FE13C44B
	for <perforce@FreeBSD.org>; Fri, 18 Jan 2008 21:45:42 +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 m0ILjgYh089426
	for <perforce@FreeBSD.org>; Fri, 18 Jan 2008 21:45:42 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ILjg57089423
	for perforce@freebsd.org; Fri, 18 Jan 2008 21:45:42 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 18 Jan 2008 21:45:42 GMT
Message-Id: <200801182145.m0ILjg57089423@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 133600 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: Fri, 18 Jan 2008 21:45:43 -0000

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

Change 133600 by hselasky@hselasky_laptop001 on 2008/01/18 21:44:55

	
	Bugfix. Need to have "usb_mtx" locked when calling
	"usbd_transfer_unsetup_sub()".

Affected files ...

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

Differences ...

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

@@ -1018,6 +1018,12 @@
 done:
 	if (buf) {
 		if (info->setup_refcount == 0) {
+			/*
+			 * "usbd_transfer_unsetup_sub" will unlock
+			 * "usb_mtx" before returning !
+			 */
+			mtx_lock(info->usb_mtx);
+
 			/* something went wrong */
 			usbd_transfer_unsetup_sub(info, 0);
 		}
@@ -1058,6 +1064,8 @@
 	struct usbd_page_cache *pc;
 	uint32_t temp;
 
+	mtx_assert(info->usb_mtx, MA_OWNED);
+
 	/* wait for any outstanding DMA operations */
 
 	if (needs_delay) {