diff --git a/[refs] b/[refs]
index 5782d21cd724..520f7971d710 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 758bb0b3e77d7876b76e48b4ac20f473be004421
+refs/heads/master: ccfb30288228aaaf40a849bffe434bc9eb46b23c
diff --git a/trunk/drivers/staging/tm6000/tm6000-video.c b/trunk/drivers/staging/tm6000/tm6000-video.c
index fd36b36407c5..ce0a089a0771 100644
--- a/trunk/drivers/staging/tm6000/tm6000-video.c
+++ b/trunk/drivers/staging/tm6000/tm6000-video.c
@@ -314,7 +314,7 @@ static int copy_streams(u8 *data, unsigned long len,
 				break;
 			}
 		}
-		if (cpysize < size) {
+		if (ptr + pktsize > endp) {
 			/* End of URB packet, but cmd processing is not
 			 * complete. Preserve the state for a next packet
 			 */
@@ -322,7 +322,7 @@ static int copy_streams(u8 *data, unsigned long len,
 			dev->isoc_ctl.size = size - cpysize;
 			dev->isoc_ctl.cmd = cmd;
 			dev->isoc_ctl.pktsize = pktsize - (endp - ptr);
-			ptr += cpysize;
+			ptr += endp - ptr;
 		} else {
 			dev->isoc_ctl.cmd = 0;
 			ptr += pktsize;