---

yaml --- r: 201946 b: refs/heads/master c: 23ba946 h: refs/heads/master v: v3
git-mirror · Aug 2, 2010 · ff5108d · ff5108d
1 parent db34acd
commit ff5108d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a59bff3714a0f568f25816772ee939796cc7741d
+refs/heads/master: 23ba94633db4311f06f57f0f53d6715feab6a018
diff --git a/trunk/drivers/staging/tm6000/tm6000-video.c b/trunk/drivers/staging/tm6000/tm6000-video.c
@@ -239,6 +239,7 @@ static int copy_streams(u8 *data, unsigned long len,
 				header = *(unsigned long *)ptr;
 				ptr += 4;
 			}
+
 			/* split the header fields */
 			c = (header >> 24) & 0xff;
 			size = ((header & 0x7e) << 1);
@@ -280,9 +281,11 @@ static int copy_streams(u8 *data, unsigned long len,
 					cmd = TM6000_URB_MSG_ERR;
 				dev->isoc_ctl.vfield = field;
 				break;
-			case TM6000_URB_MSG_AUDIO:
 			case TM6000_URB_MSG_VBI:
+				break;
+			case TM6000_URB_MSG_AUDIO:
 			case TM6000_URB_MSG_PTS:
+				cpysize = pktsize;	/* Size is always 180 bytes */
 				break;
 			}
 		} else {