---

yaml --- r: 338687 b: refs/heads/master c: c058f7a h: refs/heads/master i: 338685: 802d24a 338683: 2ed1b98 338679: a56fc66 338671: 870510e 338655: 5330b61 338623: c126c1b 338559: 4fada6b 338431: 14bfec1 v: v3
git-mirror · Nov 21, 2012 · 4410a75 · 4410a75
1 parent 71d3a0f
commit 4410a75
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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) {