From 443266881d6505d6ee2e1374f368f9c72c853576 Mon Sep 17 00:00:00 2001
From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Date: Tue, 3 Jul 2012 23:22:38 -0700
Subject: [PATCH] --- yaml --- r: 317039 b: refs/heads/master c:
 9cf65991dd93ac3d5f97f536171c388918b7c1a9 h: refs/heads/master i:   317037:
 d2363b3560bf5a74b6c39f5f12058b89658a2b5b   317035:
 49ea06344fa1fe9e5e68c6cdb1b63932eb2fc89b   317031:
 5c1e8dcf9c733155581399d641e34aaef70f557f   317023:
 f38674a5f97d0e726c6c81e54fbee15b935b8ae4 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/usb/core/message.c | 7 ++++---
 trunk/drivers/usb/core/usb.c     | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 674ddacf891a..3bcfd090807c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d1d051330ee096f575523647fbd8ffe703600b5
+refs/heads/master: 9cf65991dd93ac3d5f97f536171c388918b7c1a9
diff --git a/trunk/drivers/usb/core/message.c b/trunk/drivers/usb/core/message.c
index 8b9d669e3784..37239048be14 100644
--- a/trunk/drivers/usb/core/message.c
+++ b/trunk/drivers/usb/core/message.c
@@ -1792,14 +1792,15 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
 	 * installed, so that the xHCI driver can recalculate the U1/U2
 	 * timeouts.
 	 */
-	if (usb_disable_lpm(dev)) {
+	if (dev->actconfig && usb_disable_lpm(dev)) {
 		dev_err(&dev->dev, "%s Failed to disable LPM\n.", __func__);
 		mutex_unlock(hcd->bandwidth_mutex);
 		return -ENOMEM;
 	}
 	ret = usb_hcd_alloc_bandwidth(dev, cp, NULL, NULL);
 	if (ret < 0) {
-		usb_enable_lpm(dev);
+		if (dev->actconfig)
+			usb_enable_lpm(dev);
 		mutex_unlock(hcd->bandwidth_mutex);
 		usb_autosuspend_device(dev);
 		goto free_interfaces;
@@ -1819,7 +1820,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
 	if (!cp) {
 		usb_set_device_state(dev, USB_STATE_ADDRESS);
 		usb_hcd_alloc_bandwidth(dev, NULL, NULL, NULL);
-		usb_enable_lpm(dev);
+		/* Leave LPM disabled while the device is unconfigured. */
 		mutex_unlock(hcd->bandwidth_mutex);
 		usb_autosuspend_device(dev);
 		goto free_interfaces;
diff --git a/trunk/drivers/usb/core/usb.c b/trunk/drivers/usb/core/usb.c
index 25d0c61c3f8a..cd8fb44a3e16 100644
--- a/trunk/drivers/usb/core/usb.c
+++ b/trunk/drivers/usb/core/usb.c
@@ -396,6 +396,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
 	dev->dev.dma_mask = bus->controller->dma_mask;
 	set_dev_node(&dev->dev, dev_to_node(bus->controller));
 	dev->state = USB_STATE_ATTACHED;
+	dev->lpm_disable_count = 1;
 	atomic_set(&dev->urbnum, 0);
 
 	INIT_LIST_HEAD(&dev->ep0.urb_list);