From owner-svn-src-user@FreeBSD.ORG  Mon Sep 13 18:26:32 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E820B106564A;
	Mon, 13 Sep 2010 18:26:32 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D7D328FC15;
	Mon, 13 Sep 2010 18:26:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8DIQWlu023328;
	Mon, 13 Sep 2010 18:26:32 GMT (envelope-from weongyo@svn.freebsd.org)
Received: (from weongyo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8DIQWrL023326;
	Mon, 13 Sep 2010 18:26:32 GMT (envelope-from weongyo@svn.freebsd.org)
Message-Id: <201009131826.o8DIQWrL023326@svn.freebsd.org>
From: Weongyo Jeong <weongyo@FreeBSD.org>
Date: Mon, 13 Sep 2010 18:26:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212569 - user/weongyo/usb/sys/dev/usb/controller
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Sep 2010 18:26:33 -0000

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,