svn commit: r212569 - user/weongyo/usb/sys/dev/usb/controller

[Weongyo Jeong]

Author: weongyo
Date: Mon Sep 13 18:26:32 2010
New Revision: 212569
URL: http://svn.freebsd.org/changeset/base/212569

Log:
  Don't need to hold Giant again at attach because it's already hold from
  the bus driver.  Instead of holding it adds a assert.

Modified:
  user/weongyo/usb/sys/dev/usb/controller/usb_controller.c

Modified: user/weongyo/usb/sys/dev/usb/controller/usb_controller.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/usb_controller.c	Mon Sep 13 17:53:43 2010	(r212568)
+++ user/weongyo/usb/sys/dev/usb/controller/usb_controller.c	Mon Sep 13 18:26:32 2010	(r212569)
@@ -394,10 +394,9 @@ usb_attach_sub(device_t dev, struct usb_
 {
 	const char *pname = device_get_nameunit(dev);
 
-	mtx_lock(&Giant);
+	GIANT_REQUIRED;
 	if (usb_devclass_ptr == NULL)
 		usb_devclass_ptr = devclass_find("usbus");
-	mtx_unlock(&Giant);
 
 	/* Initialise USB explore taskqueue and tasks */
 	bus->explore_tq = taskqueue_create("usb_explore_taskq", M_WAITOK,