From 249c94f916fb0b3ae8307d9a3aea3394f0ae94ac Mon Sep 17 00:00:00 2001
From: Stefan Ringel <stefan.ringel@arcor.de>
Date: Sat, 21 May 2011 03:05:38 -0300
Subject: [PATCH] --- yaml --- r: 250347 b: refs/heads/master c:
 423c79e3fed751c244aceb39031920669e1d039a h: refs/heads/master i:   250345:
 359fdb3f8922c0eecd3e4b75bda4cb98ade69a5a   250343:
 1951517fccc58e168085e8b2fc4fc09baf49f982 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/staging/tm6000/tm6000-usb-isoc.h | 2 +-
 trunk/drivers/staging/tm6000/tm6000-video.c    | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ce66b31f79b9..6c60e21ab541 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a7b6a404b4c6a9184b60b89607d5f883c43fa62
+refs/heads/master: 423c79e3fed751c244aceb39031920669e1d039a
diff --git a/trunk/drivers/staging/tm6000/tm6000-usb-isoc.h b/trunk/drivers/staging/tm6000/tm6000-usb-isoc.h
index a9e61d95a9b2..084c2a8904a3 100644
--- a/trunk/drivers/staging/tm6000/tm6000-usb-isoc.h
+++ b/trunk/drivers/staging/tm6000/tm6000-usb-isoc.h
@@ -39,7 +39,7 @@ struct usb_isoc_ctl {
 	int				pos, size, pktsize;
 
 		/* Last field: ODD or EVEN? */
-	int				vfield;
+	int				vfield, field;
 
 		/* Stores incomplete commands */
 	u32				tmp_buf;
diff --git a/trunk/drivers/staging/tm6000/tm6000-video.c b/trunk/drivers/staging/tm6000/tm6000-video.c
index 48023965656c..4264064a727e 100644
--- a/trunk/drivers/staging/tm6000/tm6000-video.c
+++ b/trunk/drivers/staging/tm6000/tm6000-video.c
@@ -334,6 +334,7 @@ static int copy_streams(u8 *data, unsigned long len,
 			size = dev->isoc_ctl.size;
 			pos = dev->isoc_ctl.pos;
 			pktsize = dev->isoc_ctl.pktsize;
+			field = dev->isoc_ctl.field;
 		}
 		cpysize = (endp - ptr > size) ? size : endp - ptr;
 		if (cpysize) {
@@ -359,7 +360,8 @@ static int copy_streams(u8 *data, unsigned long len,
 				/* Need some code to copy pts */
 				u32 pts;
 				pts = *(u32 *)ptr;
-				printk(KERN_INFO "%s: field %d, PTS %x", dev->name, field, pts);
+				dprintk(dev, V4L2_DEBUG_ISOC, "field %d, PTS %x",
+					field, pts);
 				break;
 			}
 			}
@@ -371,6 +373,7 @@ static int copy_streams(u8 *data, unsigned long len,
 			dev->isoc_ctl.pos = pos + cpysize;
 			dev->isoc_ctl.size = size - cpysize;
 			dev->isoc_ctl.cmd = cmd;
+			dev->isoc_ctl.field = field;
 			dev->isoc_ctl.pktsize = pktsize - (endp - ptr);
 			ptr += endp - ptr;
 		} else {