From 16e53801dbcc59ee18b70d34eb9e34896b67df90 Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Sun, 13 Jun 2010 17:00:23 -0300 Subject: [PATCH] --- yaml --- r: 201983 b: refs/heads/master c: 2584bc4337855382d23b4abfc2e2492df6fdeb41 h: refs/heads/master i: 201981: bf17fd9da7f35e6081a4774355bc2d2b6c3cc431 201979: bc7d1dd5fc7bcbb9073279ae7efd86d72b8db9de 201975: 93ef4855d07a72d1f70d094cfdcdffb789ad7e6f 201967: 7f4459ac00ab521418a3532f62f1867996e69831 201951: d79266ef00f5c95b73028fad93ac58cf962b1f41 201919: 0c2d3e0f9ac6d9f3aefe3012942e44992303363f 201855: f0c69ebe46147538c92c3afde50876869b1c2c86 201727: bce1f8f6855e74efa03c5ac2f9237573cc3a7d3f v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-video.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c9615048f9f1..9f73f7cf1cdf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f8eacd2162a39ca7fc1240883118a786f147ccb +refs/heads/master: 2584bc4337855382d23b4abfc2e2492df6fdeb41 diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c index 20090e34173a..7b9ec6e493e4 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-video.c +++ b/trunk/drivers/media/video/em28xx/em28xx-video.c @@ -654,12 +654,12 @@ static inline int em28xx_isoc_copy_vbi(struct em28xx *dev, struct urb *urb) } if (buf != NULL && dev->capture_type == 2) { - if (len > 4 && p[0] == 0x88 && p[1] == 0x88 && + 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) { + 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");