From 70a92e42329d6fd03b4d3939f57c9e9c6cc5d375 Mon Sep 17 00:00:00 2001
From: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
Date: Fri, 25 Aug 2006 19:35:28 -0700
Subject: [PATCH] --- yaml --- r: 36423 b: refs/heads/master c:
 cb4c8fe57c05dbb04128503f4a7483a1163b1b47 h: refs/heads/master i:   36421:
 ba9ffbc427b398e0421ba94c6aeed76108378d13   36419:
 f5ebbe286f827e16b67488f34f77afa99aec5023   36415:
 5ab9b0cbd779b2b679e3ad902bab985b74badfda v: v3

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

diff --git a/[refs] b/[refs]
index 4dc0a2211880..8431902c0a43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfe0d3ba20e860d0b9a16c4c6524180b8f93be05
+refs/heads/master: cb4c8fe57c05dbb04128503f4a7483a1163b1b47
diff --git a/trunk/drivers/usb/core/config.c b/trunk/drivers/usb/core/config.c
index 4c9e63e665b6..bfb3731d42db 100644
--- a/trunk/drivers/usb/core/config.c
+++ b/trunk/drivers/usb/core/config.c
@@ -475,7 +475,9 @@ int usb_get_configuration(struct usb_device *dev)
 		if (result < 0) {
 			dev_err(ddev, "unable to read config index %d "
 			    "descriptor/%s\n", cfgno, "start");
-			goto err;
+			dev_err(ddev, "chopping to %d config(s)\n", cfgno);
+			dev->descriptor.bNumConfigurations = cfgno;
+			break;
 		} else if (result < 4) {
 			dev_err(ddev, "config index %d descriptor too short "
 			    "(expected %i, got %i)\n", cfgno,