From owner-p4-projects@FreeBSD.ORG  Sun Apr 20 15:17:22 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D34C4106566C; Sun, 20 Apr 2008 15:17:22 +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 95DFA106564A
	for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 15:17:22 +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 854098FC0C
	for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 15:17:22 +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 m3KFHMEI042214
	for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 15:17:22 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3KFHMak042212
	for perforce@freebsd.org; Sun, 20 Apr 2008 15:17:22 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 20 Apr 2008 15:17:22 GMT
Message-Id: <200804201517.m3KFHMak042212@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 140297 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: Sun, 20 Apr 2008 15:17:23 -0000

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

Change 140297 by hselasky@hselasky_laptop001 on 2008/04/20 15:16:57

	
	There is some USB code that depends on Giant
	being locked when "attach" is called, which
	should not depend on that.
	Fix this.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/ukbd.c#43 edit
.. //depot/projects/usb/src/sys/dev/usb/uvscom.c#39 edit

Differences ...

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

@@ -704,15 +704,17 @@
 	if (bootverbose) {
 		genkbd_diag(kbd, bootverbose);
 	}
+	/* lock keyboard mutex */
+
+	mtx_lock(&Giant);
+
 	/* start the keyboard */
 
 	usbd_transfer_start(sc->sc_xfer[0]);
 
 	/* start the timer */
 
-	mtx_lock(&Giant);
-
-	ukbd_timeout(sc);
+	ukbd_timeout(sc);		/* will unlock mutex */
 
 	return (0);			/* success */
 

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

@@ -365,8 +365,9 @@
 		goto detach;
 	}
 	/* start interrupt pipe */
-
+	mtx_lock(sc->sc_xfer[4]->priv_mtx);
 	usbd_transfer_start(sc->sc_xfer[4]);
+	mtx_unlock(sc->sc_xfer[4]->priv_mtx);
 
 	return (0);