diff --git a/[refs] b/[refs]
index 4c6e56d83f51..3b0b912b2d54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7ac7787ad361e31a7972e2854ed8dc2eedfac3b
+refs/heads/master: 3a22b872e923954853cabd5a18f41da1846bccdb
diff --git a/trunk/drivers/usb/core/config.c b/trunk/drivers/usb/core/config.c
index f4bdd0ce8d56..7199adccf444 100644
--- a/trunk/drivers/usb/core/config.c
+++ b/trunk/drivers/usb/core/config.c
@@ -702,6 +702,8 @@ int usb_get_configuration(struct usb_device *dev)
 		if (result < 0) {
 			dev_err(ddev, "unable to read config index %d "
 			    "descriptor/%s: %d\n", cfgno, "start", result);
+			if (result != -EPIPE)
+				goto err;
 			dev_err(ddev, "chopping to %d config(s)\n", cfgno);
 			dev->descriptor.bNumConfigurations = cfgno;
 			break;