---

yaml --- r: 36423 b: refs/heads/master c: cb4c8fe h: refs/heads/master i: 36421: ba9ffbc 36419: f5ebbe2 36415: 5ab9b0c v: v3
git-mirror · Sep 27, 2006 · 70a92e4 · 70a92e4
1 parent 90f1a3b
commit 70a92e4
Show file tree

Hide file tree

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