---

yaml --- r: 210960 b: refs/heads/master c: 1018b4e h: refs/heads/master v: v3
git-mirror · Sep 24, 2010 · 80cb43d · 80cb43d
1 parent f8a2886
commit 80cb43d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;