From owner-p4-projects@FreeBSD.ORG  Mon Mar 23 20:01:09 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1539F1065675; Mon, 23 Mar 2009 20:01:09 +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 8C30A1065674
	for <perforce@FreeBSD.org>; Mon, 23 Mar 2009 20:01:08 +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 7A5ED8FC13
	for <perforce@FreeBSD.org>; Mon, 23 Mar 2009 20:01:08 +0000 (UTC)
	(envelope-from hselasky@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 n2NK188B067006
	for <perforce@FreeBSD.org>; Mon, 23 Mar 2009 20:01:08 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2NK18cP067004
	for perforce@freebsd.org; Mon, 23 Mar 2009 20:01:08 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 23 Mar 2009 20:01:08 GMT
Message-Id: <200903232001.n2NK18cP067004@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 159700 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, 23 Mar 2009 20:01:10 -0000

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

Change 159700 by hselasky@hselasky_laptop001 on 2009/03/23 20:00:37

	
	USB controller:
	- get rid of the last CALLOUT_RETURNUNLOCKED reference.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#7 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#7 (text+ko) ====

@@ -277,7 +277,7 @@
 
 	usb2_bus_power_update(bus);
 
-	return;
+	USB_BUS_LOCK(bus);
 }
 
 /*------------------------------------------------------------------------*
@@ -356,11 +356,8 @@
 	/* set softc - we are ready */
 	device_set_softc(dev, bus);
 
-	/* start watchdog - this function will unlock the BUS lock ! */
+	/* start watchdog */
 	usb2_power_wdog(bus);
-
-	/* need to return locked */
-	USB_BUS_LOCK(bus);
 }
 
 /*------------------------------------------------------------------------*
@@ -534,7 +531,7 @@
 	    NULL, MTX_DEF | MTX_RECURSE);
 
 	usb2_callout_init_mtx(&bus->power_wdog,
-	    &bus->bus_mtx, CALLOUT_RETURNUNLOCKED);
+	    &bus->bus_mtx, 0);
 
 	TAILQ_INIT(&bus->intr_q.head);