From owner-p4-projects@FreeBSD.ORG  Mon Jan  7 18:35:47 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 20ADB16A41A; Mon,  7 Jan 2008 18:35:46 +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 A33B216A418
	for <perforce@FreeBSD.org>; Mon,  7 Jan 2008 18:35:46 +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 884E413C458
	for <perforce@FreeBSD.org>; Mon,  7 Jan 2008 18:35:46 +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 m07IZkgC099692
	for <perforce@FreeBSD.org>; Mon, 7 Jan 2008 18:35:46 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m07IZkF6099689
	for perforce@freebsd.org; Mon, 7 Jan 2008 18:35:46 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 7 Jan 2008 18:35:46 GMT
Message-Id: <200801071835.m07IZkF6099689@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 132726 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, 07 Jan 2008 18:35:47 -0000

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

Change 132726 by hselasky@hselasky_laptop001 on 2008/01/07 18:35:22

	
	Fix a LOR. This code is called from the
	explore thread, so it is safe to drop the
	locks.

Affected files ...

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

Differences ...

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

@@ -3371,6 +3371,8 @@
 				PRINTFN(0, ("alt setting no change\n"));
 				break;
 			}
+			mtx_unlock(xfer->priv_mtx);
+
 			usbd_detach_device(udev, req.wIndex[0], 1);
 
 			error = usbd_set_alt_interface_index(udev,
@@ -3378,14 +3380,17 @@
 			if (error) {
 				PRINTFN(0, ("alt setting failed %s\n",
 				    usbd_errstr(error)));
+				mtx_lock(xfer->priv_mtx);
 				goto tr_stalled;
 			}
 			error = usbd_probe_and_attach(udev,
 			    req.wIndex[0]);
 			if (error) {
 				PRINTFN(0, ("alt setting probe failed\n"));
+				mtx_lock(xfer->priv_mtx);
 				goto tr_stalled;
 			}
+			mtx_lock(xfer->priv_mtx);
 			break;
 		default:
 			goto tr_stalled;