From owner-p4-projects@FreeBSD.ORG  Sat Dec 20 05:47: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 CE5571065678; Sat, 20 Dec 2008 05:47: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 85670106564A
	for <perforce@FreeBSD.org>; Sat, 20 Dec 2008 05:47:46 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 732408FC12
	for <perforce@FreeBSD.org>; Sat, 20 Dec 2008 05:47:46 +0000 (UTC)
	(envelope-from weongyo@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 mBK5lk7n056598
	for <perforce@FreeBSD.org>; Sat, 20 Dec 2008 05:47:46 GMT
	(envelope-from weongyo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBK5lkvx056596
	for perforce@freebsd.org; Sat, 20 Dec 2008 05:47:46 GMT
	(envelope-from weongyo@FreeBSD.org)
Date: Sat, 20 Dec 2008 05:47:46 GMT
Message-Id: <200812200547.mBK5lkvx056596@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	weongyo@FreeBSD.org using -f
From: Weongyo Jeong <weongyo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 155039 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, 20 Dec 2008 05:47:47 -0000

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

Change 155039 by weongyo@weongyo_ws on 2008/12/20 05:47:44

	prevent sleeping without a lock

Affected files ...

.. //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#30 edit

Differences ...

==== //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#30 (text+ko) ====

@@ -483,6 +483,8 @@
 	usb_config_descriptor_t cd, *cdp;
 	usbd_status status;
 
+	mtx_lock(&Giant);
+
 	urb = usbd_geturb(ip);
 	ctldesc = &urb->uu_ctldesc;
 	if (ctldesc->ucd_desctype == UDESC_CONFIG) {
@@ -491,6 +493,7 @@
 		    &cd);
 		if (status != USBD_NORMAL_COMPLETION) {
 			ctldesc->ucd_trans_buflen = 0;
+			mtx_unlock(&Giant);
 			return usbd_usb2urb(status);
 		}
 		/* Get the full descriptor.  Try a few times for slow devices. */
@@ -505,6 +508,7 @@
 		}
 		if (status != USBD_NORMAL_COMPLETION) {
 			ctldesc->ucd_trans_buflen = 0;
+			mtx_unlock(&Giant);
 			return usbd_usb2urb(status);
 		}
 
@@ -534,11 +538,15 @@
 
 	if (status != USBD_NORMAL_COMPLETION) {
 		ctldesc->ucd_trans_buflen = 0;
+		mtx_unlock(&Giant);
 		return usbd_usb2urb(status);
 	}
 
 	ctldesc->ucd_trans_buflen = actlen;
 	ip->irp_iostat.isb_info = actlen;
+
+	mtx_unlock(&Giant);
+
 	return (USBD_STATUS_SUCCESS);
 }