From c98d92e06a90ad3e0786d5b38621864e1514eb93 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sun, 13 Apr 2008 15:09:14 -0300
Subject: [PATCH] --- yaml --- r: 92651 b: refs/heads/master c:
 b4916f8ca1da71bb97fb6dcf1e8da3f9c64cf80e h: refs/heads/master i:   92649:
 47d2b2d940bd2c1f6a52f7407817ee807a94a3d8   92647:
 eb5e4eb530fd768caa3399df430d31698f89f83e v: v3

---
 [refs]                                        |  2 +-
 .../drivers/media/video/em28xx/em28xx-video.c | 31 ++++++++++---------
 trunk/drivers/media/video/em28xx/em28xx.h     |  3 ++
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 28e0da678740..c0a2a4f63f42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbecb44c11d9517d604240b53581951ac4e3b5e6
+refs/heads/master: b4916f8ca1da71bb97fb6dcf1e8da3f9c64cf80e
diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c
index 10928dccaecc..d5728c2cd360 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-video.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-video.c
@@ -365,32 +365,33 @@ static inline int em28xx_isoc_copy(struct urb *urb)
 		/* FIXME: incomplete buffer checks where removed to make
 		   logic simpler. Impacts of those changes should be evaluated
 		 */
+		if (p[0] == 0x33 && p[1] == 0x95 && p[2] == 0x00) {
+			em28xx_isocdbg("VBI HEADER!!!\n");
+			/* FIXME: Should add vbi copy */
+			continue;
+		}
 		if (p[0] == 0x22 && p[1] == 0x5a) {
 			em28xx_isocdbg("Video frame %d, length=%i, %s\n", p[2],
 				       len, (p[2] & 1)? "odd" : "even");
 
 			if (p[2] & 1)
 				buf->top_field = 0;
-			else {
-				if (buf->receiving) {
-					buffer_filled(dev, dma_q, buf);
-					rc = get_next_buf(dma_q, &buf);
-					if (rc <= 0)
-						return rc;
-					outp = videobuf_to_vmalloc(&buf->vb);
-				}
-
+			else
 				buf->top_field = 1;
+
+//			if (dev->isoc_ctl.last_field && !buf->top_field) {
+			if (dev->isoc_ctl.last_field != buf->top_field) {
+				buffer_filled(dev, dma_q, buf);
+				rc = get_next_buf(dma_q, &buf);
+				if (rc <= 0)
+					return rc;
+				outp = videobuf_to_vmalloc(&buf->vb);
 			}
-			buf->receiving = 1;
+			dev->isoc_ctl.last_field =  buf->top_field;
+
 			dma_q->pos = 0;
-		} else if (p[0] == 0x33 && p[1] == 0x95 && p[2] == 0x00) {
-			em28xx_isocdbg("VBI HEADER!!!\n");
 		}
-
 		em28xx_copy_video(dev, dma_q, buf, p, outp, len);
-
-		/* FIXME: Should add vbi copy */
 	}
 	return rc;
 }
diff --git a/trunk/drivers/media/video/em28xx/em28xx.h b/trunk/drivers/media/video/em28xx/em28xx.h
index 6d62357a038f..993c1ed05cc3 100644
--- a/trunk/drivers/media/video/em28xx/em28xx.h
+++ b/trunk/drivers/media/video/em28xx/em28xx.h
@@ -114,6 +114,9 @@ struct em28xx_usb_isoc_ctl {
 		/* Stores already requested buffers */
 	struct em28xx_buffer    	*buf;
 
+		/* Store last filled frame */
+	int				last_field;
+
 		/* Stores the number of received fields */
 	int				nfields;
 };