From f5457132643c515518c1ddf167504d614762f5f8 Mon Sep 17 00:00:00 2001
From: Frank Schaefer <fschaefer.oss@googlemail.com>
Date: Sun, 25 Nov 2012 06:37:32 -0300
Subject: [PATCH] --- yaml --- r: 357142 b: refs/heads/master c:
 b77e0c088f07817ecfc4e0a34d4d6a3f99a3ecaf h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 53e6741d85bf..6646ad4fcf73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 454fe92f01f8d669669619a9b301d133eda9d173
+refs/heads/master: b77e0c088f07817ecfc4e0a34d4d6a3f99a3ecaf
diff --git a/trunk/drivers/media/usb/em28xx/em28xx-video.c b/trunk/drivers/media/usb/em28xx/em28xx-video.c
index c7e23dd73b88..fec8847e84d8 100644
--- a/trunk/drivers/media/usb/em28xx/em28xx-video.c
+++ b/trunk/drivers/media/usb/em28xx/em28xx-video.c
@@ -678,24 +678,8 @@ static inline int em28xx_urb_data_copy_vbi(struct em28xx *dev, struct urb *urb)
 			dma_q->pos = 0;
 		}
 
-		if (buf != NULL && dev->capture_type == 2) {
-			if (len >= 4 && p[0] == 0x88 && p[1] == 0x88 &&
-			    p[2] == 0x88 && p[3] == 0x88) {
-				p += 4;
-				len -= 4;
-			}
-			if (len >= 4 && p[0] == 0x22 && p[1] == 0x5a) {
-				em28xx_isocdbg("Video frame %d, len=%i, %s\n",
-					       p[2], len, (p[2] & 1) ?
-					       "odd" : "even");
-				p += 4;
-				len -= 4;
-			}
-
-			if (len > 0)
-				em28xx_copy_video(dev, dma_q, buf, p, outp,
-						  len);
-		}
+		if (buf != NULL && dev->capture_type == 2 && len > 0)
+			em28xx_copy_video(dev, dma_q, buf, p, outp, len);
 	}
 	return rc;
 }