diff --git a/[refs] b/[refs]
index ee2554b898c7..aef4a9b45ca0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 624defa12f304b4d11eda309bc207fa5a1900d0f
+refs/heads/master: 6682bb39e111b34290e25c4d275c5bcf8bbccbe1
diff --git a/trunk/drivers/usb/core/config.c b/trunk/drivers/usb/core/config.c
index a16c538d0132..0d3af6a6ee49 100644
--- a/trunk/drivers/usb/core/config.c
+++ b/trunk/drivers/usb/core/config.c
@@ -105,7 +105,7 @@ static int usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno,
 	ep->ss_ep_comp->extralen = i;
 	buffer += i;
 	size -= i;
-	retval = buffer - buffer_start + i;
+	retval = buffer - buffer_start;
 	if (num_skipped > 0)
 		dev_dbg(ddev, "skipped %d descriptor%s after %s\n",
 				num_skipped, plural(num_skipped),