diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index 26678cadfb21..86167b585f84 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -704,7 +704,7 @@ int usb_get_configuration(struct usb_device *dev)
 			    "descriptor/%s: %d\n", cfgno, "start", result);
 			dev_err(ddev, "chopping to %d config(s)\n", cfgno);
 			dev->descriptor.bNumConfigurations = cfgno;
-			break;
+			goto err;
 		} else if (result < 4) {
 			dev_err(ddev, "config index %d descriptor too short "
 			    "(expected %i, got %i)\n", cfgno,