summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/pac7311.c
diff options
context:
space:
mode:
authorJean-Francois Moine2008-09-03 21:47:22 +0200
committerMauro Carvalho Chehab2008-09-03 23:36:27 +0200
commit23d9e4776b426d1f8a602e0e8d868154847f0dd4 (patch)
treed5f54a8e867f0540a96b368c5d9082f5f85178c4 /drivers/media/video/gspca/pac7311.c
parentV4L/DVB (8660): gspca: Simplify the scan of URB packets in pac7311. (diff)
downloadkernel-qcow2-linux-23d9e4776b426d1f8a602e0e8d868154847f0dd4.tar.gz
kernel-qcow2-linux-23d9e4776b426d1f8a602e0e8d868154847f0dd4.tar.xz
kernel-qcow2-linux-23d9e4776b426d1f8a602e0e8d868154847f0dd4.zip
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>
Diffstat (limited to 'drivers/media/video/gspca/pac7311.c')
-rw-r--r--drivers/media/video/gspca/pac7311.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c
index caa33292a08a..96cd7f644adf 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;