diff options
Diffstat (limited to 'drivers/usb/core/hub.c')
-rw-r--r-- | drivers/usb/core/hub.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 0eb27006f846..825d803720b3 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
@@ -3776,13 +3776,13 @@ static int usb_reset_and_verify_device(struct usb_device *udev) | |||
3776 | if (!udev->actconfig) | 3776 | if (!udev->actconfig) |
3777 | goto done; | 3777 | goto done; |
3778 | 3778 | ||
3779 | mutex_lock(&hcd->bandwidth_mutex); | 3779 | mutex_lock(hcd->bandwidth_mutex); |
3780 | ret = usb_hcd_alloc_bandwidth(udev, udev->actconfig, NULL, NULL); | 3780 | ret = usb_hcd_alloc_bandwidth(udev, udev->actconfig, NULL, NULL); |
3781 | if (ret < 0) { | 3781 | if (ret < 0) { |
3782 | dev_warn(&udev->dev, | 3782 | dev_warn(&udev->dev, |
3783 | "Busted HC? Not enough HCD resources for " | 3783 | "Busted HC? Not enough HCD resources for " |
3784 | "old configuration.\n"); | 3784 | "old configuration.\n"); |
3785 | mutex_unlock(&hcd->bandwidth_mutex); | 3785 | mutex_unlock(hcd->bandwidth_mutex); |
3786 | goto re_enumerate; | 3786 | goto re_enumerate; |
3787 | } | 3787 | } |
3788 | ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), | 3788 | ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), |
@@ -3793,10 +3793,10 @@ static int usb_reset_and_verify_device(struct usb_device *udev) | |||
3793 | dev_err(&udev->dev, | 3793 | dev_err(&udev->dev, |
3794 | "can't restore configuration #%d (error=%d)\n", | 3794 | "can't restore configuration #%d (error=%d)\n", |
3795 | udev->actconfig->desc.bConfigurationValue, ret); | 3795 | udev->actconfig->desc.bConfigurationValue, ret); |
3796 | mutex_unlock(&hcd->bandwidth_mutex); | 3796 | mutex_unlock(hcd->bandwidth_mutex); |
3797 | goto re_enumerate; | 3797 | goto re_enumerate; |
3798 | } | 3798 | } |
3799 | mutex_unlock(&hcd->bandwidth_mutex); | 3799 | mutex_unlock(hcd->bandwidth_mutex); |
3800 | usb_set_device_state(udev, USB_STATE_CONFIGURED); | 3800 | usb_set_device_state(udev, USB_STATE_CONFIGURED); |
3801 | 3801 | ||
3802 | /* Put interfaces back into the same altsettings as before. | 3802 | /* Put interfaces back into the same altsettings as before. |