]> err.no Git - linux-2.6/commitdiff
V4L/DVB (8813): gspca: Adjust SOF detection for pac73xx.
authorHans de Goede <j.w.r.degoede@hhs.nl>
Wed, 3 Sep 2008 20:12:14 +0000 (17:12 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 3 Sep 2008 21:37:25 +0000 (18:37 -0300)
Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/gspca/pac7311.c

index bed04cc9a58430a5aef5dafb82befe8173074363..3c5142852f2781b43334d2714e6ac285cfd6533c 100644 (file)
@@ -70,7 +70,6 @@ struct sd {
 #define SENSOR_PAC7311 1
 
        u8 sof_read;
-       u8 header_read;
        u8 autogain_ignore_frames;
 
        atomic_t avg_lum;
@@ -709,8 +708,6 @@ static const unsigned char pac7311_jpeg_header2[] = {
 /* Include pac common sof detection functions */
 #include "pac_common.h"
 
-#define HEADER_LENGTH 2
-
 /* this function is run at interrupt level */
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                        struct gspca_frame *frame,      /* target */
@@ -784,22 +781,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                gspca_frame_add(gspca_dev, INTER_PACKET, frame, tmpbuf, 4);
                gspca_frame_add(gspca_dev, INTER_PACKET, frame,
                        pac7311_jpeg_header2, sizeof(pac7311_jpeg_header2));
-
-               sd->header_read = 0;
        }
-
-       if (sd->header_read < HEADER_LENGTH) {
-               /* skip the variable part of the sof header */
-               int needed = HEADER_LENGTH - sd->header_read;
-               if (len <= needed) {
-                       sd->header_read += len;
-                       return;
-               }
-               data += needed;
-               len -= needed;
-               sd->header_read = HEADER_LENGTH;
-       }
-
        gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);
 }