From 4410a75fd104ce7ab0d0cd0cdede597be497f9c6 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Wed, 21 Nov 2012 11:01:19 +0530
Subject: [PATCH] --- yaml --- r: 338687 b: refs/heads/master c:
 c058f7ab94143dfa2286e496019b7ad0b95502ac h: refs/heads/master i:   338685:
 802d24a988a2c7e0ac5e0cef177a6f44e8b521c3   338683:
 2ed1b981ecc76ca3c2335110b1cbb5b6fad96fdf   338679:
 a56fc66eb3fe2fb9816aedb22c79c9f039e67ece   338671:
 870510e9d8ea1dce0900cc4a98b6fcdb1b3fc88a   338655:
 5330b61a71c165c93c6a63070223ca8ae51294a6   338623:
 c126c1b8d4c6b06863dd1026f9fc67c74b5a2610   338559:
 4fada6be6b93779e30dd2a541210debf918e73a5   338431:
 14bfec141efa94b75f4c1fd2ab14006e695763ba v: v3

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

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) {