From owner-svn-src-head@FreeBSD.ORG  Mon Dec 19 14:53:42 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D8A38106566B;
	Mon, 19 Dec 2011 14:53:42 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C74618FC12;
	Mon, 19 Dec 2011 14:53:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBJErgG5062169;
	Mon, 19 Dec 2011 14:53:42 GMT
	(envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBJErgYA062167;
	Mon, 19 Dec 2011 14:53:42 GMT
	(envelope-from hselasky@svn.freebsd.org)
Message-Id: <201112191453.pBJErgYA062167@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Mon, 19 Dec 2011 14:53:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228709 - head/sys/dev/usb/controller
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Dec 2011 14:53:42 -0000

Author: hselasky
Date: Mon Dec 19 14:53:42 2011
New Revision: 228709
URL: http://svn.freebsd.org/changeset/base/228709

Log:
  Add missing unlock of USB controller's lock, when
  doing shutdown, suspend and resume.
  
  Suggested by:	avg @
  MFC after:	3 days

Modified:
  head/sys/dev/usb/controller/usb_controller.c

Modified: head/sys/dev/usb/controller/usb_controller.c
==============================================================================
--- head/sys/dev/usb/controller/usb_controller.c	Mon Dec 19 13:38:28 2011	(r228708)
+++ head/sys/dev/usb/controller/usb_controller.c	Mon Dec 19 14:53:42 2011	(r228709)
@@ -390,6 +390,8 @@ usb_bus_suspend(struct usb_proc_msg *pm)
 	if (udev == NULL || bus->bdev == NULL)
 		return;
 
+	USB_BUS_UNLOCK(bus);
+
 	bus_generic_shutdown(bus->bdev);
 
 	usbd_enum_lock(udev);
@@ -410,6 +412,8 @@ usb_bus_suspend(struct usb_proc_msg *pm)
 		(bus->methods->set_hw_power_sleep) (bus, USB_HW_POWER_SUSPEND);
 
 	usbd_enum_unlock(udev);
+
+	USB_BUS_LOCK(bus);
 }
 
 /*------------------------------------------------------------------------*
@@ -430,6 +434,8 @@ usb_bus_resume(struct usb_proc_msg *pm)
 	if (udev == NULL || bus->bdev == NULL)
 		return;
 
+	USB_BUS_UNLOCK(bus);
+
 	usbd_enum_lock(udev);
 #if 0
 	DEVMETHOD(usb_take_controller, NULL);	/* dummy */
@@ -457,6 +463,8 @@ usb_bus_resume(struct usb_proc_msg *pm)
 		device_printf(bus->bdev, "Could not configure root HUB\n");
 
 	usbd_enum_unlock(udev);
+
+	USB_BUS_LOCK(bus);
 }
 
 /*------------------------------------------------------------------------*
@@ -477,6 +485,8 @@ usb_bus_shutdown(struct usb_proc_msg *pm
 	if (udev == NULL || bus->bdev == NULL)
 		return;
 
+	USB_BUS_UNLOCK(bus);
+
 	bus_generic_shutdown(bus->bdev);
 
 	usbd_enum_lock(udev);
@@ -497,6 +507,8 @@ usb_bus_shutdown(struct usb_proc_msg *pm
 		(bus->methods->set_hw_power_sleep) (bus, USB_HW_POWER_SHUTDOWN);
 
 	usbd_enum_unlock(udev);
+
+	USB_BUS_LOCK(bus);
 }
 
 static void