diff --git a/[refs] b/[refs]
index 951264d4838f..957c95d2c572 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 490e5fbe8ccb198fb719ae49eaa0c7071273e016
+refs/heads/master: 1018b4e44f4f191c6e3c631c4eee35d0a112d32b
diff --git a/trunk/drivers/usb/musb/musb_gadget.c b/trunk/drivers/usb/musb/musb_gadget.c
index 176e1276dc28..f3ee04f2e17d 100644
--- a/trunk/drivers/usb/musb/musb_gadget.c
+++ b/trunk/drivers/usb/musb/musb_gadget.c
@@ -659,10 +659,11 @@ static void rxstate(struct musb *musb, struct musb_request *req)
 				if (request->actual < request->length) {
 					int transfer_size = 0;
 #ifdef USE_MODE1
-					transfer_size = min(request->length,
+					transfer_size = min(request->length - request->actual,
 							channel->max_len);
 #else
-					transfer_size = len;
+					transfer_size = min(request->length - request->actual,
+							(unsigned)len);
 #endif
 					if (transfer_size <= musb_ep->packet_sz)
 						musb_ep->dma->desired_mode = 0;