diff --git a/[refs] b/[refs]
index 33dda3c6697c..064ae6021c00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23ba94633db4311f06f57f0f53d6715feab6a018
+refs/heads/master: d0669c872ff68cac5ab312569e716c12171440a9
diff --git a/trunk/drivers/staging/tm6000/tm6000-video.c b/trunk/drivers/staging/tm6000/tm6000-video.c
index 6bf2b1387bd0..9a0b5a78c957 100644
--- a/trunk/drivers/staging/tm6000/tm6000-video.c
+++ b/trunk/drivers/staging/tm6000/tm6000-video.c
@@ -285,7 +285,7 @@ static int copy_streams(u8 *data, unsigned long len,
 				break;
 			case TM6000_URB_MSG_AUDIO:
 			case TM6000_URB_MSG_PTS:
-				cpysize = pktsize;	/* Size is always 180 bytes */
+				size = pktsize;		/* Size is always 180 bytes */
 				break;
 			}
 		} else {
@@ -315,7 +315,7 @@ static int copy_streams(u8 *data, unsigned long len,
 				break;
 			}
 		}
-		if (ptr + pktsize > endp) {
+		if (cpysize < size) {
 			/* End of URB packet, but cmd processing is not
 			 * complete. Preserve the state for a next packet
 			 */
@@ -323,7 +323,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 += endp - ptr;
+			ptr += cpysize;
 		} else {
 			dev->isoc_ctl.cmd = 0;
 			ptr += pktsize;