From: Jean-Francois Moine <moinejf@free.fr>
Date: Wed, 3 Sep 2008 19:47:22 +0000 (-0300)
Subject: V4L/DVB (8661): gspca: Bug in the previous changeset about pac7311.
X-Git-Tag: v2.6.27-rc6~37^2~4^2~84
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23d9e4776b426d1f8a602e0e8d868154847f0dd4;p=linux-2.6

V4L/DVB (8661): gspca: Bug in the previous changeset about pac7311.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c
index caa33292a0..96cd7f644a 100644
--- a/drivers/media/video/gspca/pac7311.c
+++ b/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;