diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/core/message.c | 7 | ||||
-rw-r--r-- | drivers/usb/core/usb.c | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index 8b9d669e3784..37239048be14 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c | |||
@@ -1792,14 +1792,15 @@ free_interfaces: | |||
1792 | * installed, so that the xHCI driver can recalculate the U1/U2 | 1792 | * installed, so that the xHCI driver can recalculate the U1/U2 |
1793 | * timeouts. | 1793 | * timeouts. |
1794 | */ | 1794 | */ |
1795 | if (usb_disable_lpm(dev)) { | 1795 | if (dev->actconfig && usb_disable_lpm(dev)) { |
1796 | dev_err(&dev->dev, "%s Failed to disable LPM\n.", __func__); | 1796 | dev_err(&dev->dev, "%s Failed to disable LPM\n.", __func__); |
1797 | mutex_unlock(hcd->bandwidth_mutex); | 1797 | mutex_unlock(hcd->bandwidth_mutex); |
1798 | return -ENOMEM; | 1798 | return -ENOMEM; |
1799 | } | 1799 | } |
1800 | ret = usb_hcd_alloc_bandwidth(dev, cp, NULL, NULL); | 1800 | ret = usb_hcd_alloc_bandwidth(dev, cp, NULL, NULL); |
1801 | if (ret < 0) { | 1801 | if (ret < 0) { |
1802 | usb_enable_lpm(dev); | 1802 | if (dev->actconfig) |
1803 | usb_enable_lpm(dev); | ||
1803 | mutex_unlock(hcd->bandwidth_mutex); | 1804 | mutex_unlock(hcd->bandwidth_mutex); |
1804 | usb_autosuspend_device(dev); | 1805 | usb_autosuspend_device(dev); |
1805 | goto free_interfaces; | 1806 | goto free_interfaces; |
@@ -1819,7 +1820,7 @@ free_interfaces: | |||
1819 | if (!cp) { | 1820 | if (!cp) { |
1820 | usb_set_device_state(dev, USB_STATE_ADDRESS); | 1821 | usb_set_device_state(dev, USB_STATE_ADDRESS); |
1821 | usb_hcd_alloc_bandwidth(dev, NULL, NULL, NULL); | 1822 | usb_hcd_alloc_bandwidth(dev, NULL, NULL, NULL); |
1822 | usb_enable_lpm(dev); | 1823 | /* Leave LPM disabled while the device is unconfigured. */ |
1823 | mutex_unlock(hcd->bandwidth_mutex); | 1824 | mutex_unlock(hcd->bandwidth_mutex); |
1824 | usb_autosuspend_device(dev); | 1825 | usb_autosuspend_device(dev); |
1825 | goto free_interfaces; | 1826 | goto free_interfaces; |
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 25d0c61c3f8a..cd8fb44a3e16 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c | |||
@@ -396,6 +396,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent, | |||
396 | dev->dev.dma_mask = bus->controller->dma_mask; | 396 | dev->dev.dma_mask = bus->controller->dma_mask; |
397 | set_dev_node(&dev->dev, dev_to_node(bus->controller)); | 397 | set_dev_node(&dev->dev, dev_to_node(bus->controller)); |
398 | dev->state = USB_STATE_ATTACHED; | 398 | dev->state = USB_STATE_ATTACHED; |
399 | dev->lpm_disable_count = 1; | ||
399 | atomic_set(&dev->urbnum, 0); | 400 | atomic_set(&dev->urbnum, 0); |
400 | 401 | ||
401 | INIT_LIST_HEAD(&dev->ep0.urb_list); | 402 | INIT_LIST_HEAD(&dev->ep0.urb_list); |