diff --git a/[refs] b/[refs] index c5a6bb72d502..cb333b5ce45b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 564e69893c63cefe4bcbdeda4f940bf68b6b4491 +refs/heads/master: c058f7ab94143dfa2286e496019b7ad0b95502ac diff --git a/trunk/drivers/usb/core/message.c b/trunk/drivers/usb/core/message.c index 73c5d1a04135..131f73649b60 100644 --- a/trunk/drivers/usb/core/message.c +++ b/trunk/drivers/usb/core/message.c @@ -1786,7 +1786,8 @@ int usb_set_configuration(struct usb_device *dev, int configuration) 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 = -ENOMEM; + goto free_interfaces; } ret = usb_hcd_alloc_bandwidth(dev, cp, NULL, NULL); if (ret < 0) {