From a81d43ab1895ce1e22bf9ac3b4b99eea43b420e3 Mon Sep 17 00:00:00 2001 From: Jean-Francois Moine Date: Wed, 3 Sep 2008 16:47:22 -0300 Subject: [PATCH] --- yaml --- r: 109511 b: refs/heads/master c: 23d9e4776b426d1f8a602e0e8d868154847f0dd4 h: refs/heads/master i: 109509: 1b696d42819e953ad2758f67a0b7c8342be5732a 109507: 69af841a9c38318c6385c330d0bfd2746874841e 109503: 00be7dd28660926af2eb9e2cf39bc8ac3cdd12cf v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/pac7311.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7099810b1a3d..377069b62c2a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e52a5574de9d3bb297a26566871eabcbdfab13b5 +refs/heads/master: 23d9e4776b426d1f8a602e0e8d868154847f0dd4 diff --git a/trunk/drivers/media/video/gspca/pac7311.c b/trunk/drivers/media/video/gspca/pac7311.c index caa33292a08a..96cd7f644adf 100644 --- a/trunk/drivers/media/video/gspca/pac7311.c +++ b/trunk/drivers/media/video/gspca/pac7311.c @@ -610,13 +610,14 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, continue; switch (data[i + 1]) { case 0xd9: /* end of frame */ + i += 2; frame = gspca_frame_add(gspca_dev, LAST_PACKET, - frame, data, i + 1); - data += INTER_FRAME; - len -= INTER_FRAME; + frame, data, i); + data += i + INTER_FRAME; + len -= i + INTER_FRAME; i = 0; - if (len > LUM_OFFSET) + if (len > -LUM_OFFSET) sd->lum_sum += data[-LUM_OFFSET]; if (len < 0) { sd->tosof = -len;