PERFORCE change 159700 for review

[Hans Petter Selasky]

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

Change 159700 by hselasky at 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);