diff --git a/[refs] b/[refs]
index 61a28980974d..43cddc59de1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 660fa8863d2623b733d7977a56e2990437abcbdb
+refs/heads/master: f69dfa1f01e20387ada601f2bf772061d79e6a8f
diff --git a/trunk/drivers/usb/musb/musb_core.c b/trunk/drivers/usb/musb/musb_core.c
index 4bc2ad8352a7..dd24f966af10 100644
--- a/trunk/drivers/usb/musb/musb_core.c
+++ b/trunk/drivers/usb/musb/musb_core.c
@@ -1295,7 +1295,7 @@ static int __devinit ep_config_from_table(struct musb *musb)
 		if (offset < 0) {
 			pr_debug("%s: mem overrun, ep %d\n",
 					musb_driver_name, epn);
-			return -EINVAL;
+			return offset;
 		}
 		epn++;
 		musb->nr_endpoints = max(epn, musb->nr_endpoints);