summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-08-05 11:16:19 +0200
committerJean-Francois Moine <moinejf@free.fr>2008-08-05 11:16:19 +0200
commit2ff4bb725cf7b17813461842cd8b4d20e3fff28a (patch)
tree4970fd977b365cc2ce5b8fdf2c61085173cff52f
parent04874827dbbfe036d172dd2256a7ec88ddf9d1a7 (diff)
downloadmediapointer-dvb-s2-2ff4bb725cf7b17813461842cd8b4d20e3fff28a.tar.gz
mediapointer-dvb-s2-2ff4bb725cf7b17813461842cd8b4d20e3fff28a.tar.bz2
gspca: Bug in the previous changeset about pac7311.
From: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
-rw-r--r--linux/drivers/media/video/gspca/pac7311.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/linux/drivers/media/video/gspca/pac7311.c b/linux/drivers/media/video/gspca/pac7311.c
index 0fecf4ea7..1648c948e 100644
--- a/linux/drivers/media/video/gspca/pac7311.c
+++ b/linux/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;