diff options
Diffstat (limited to 'drivers/media/video/gspca/zc3xx.c')
-rw-r--r-- | drivers/media/video/gspca/zc3xx.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c index 113050792246..864974b61145 100644 --- a/drivers/media/video/gspca/zc3xx.c +++ b/drivers/media/video/gspca/zc3xx.c | |||
@@ -6974,17 +6974,16 @@ static void sd_stop0(struct gspca_dev *gspca_dev) | |||
6974 | } | 6974 | } |
6975 | 6975 | ||
6976 | static void sd_pkt_scan(struct gspca_dev *gspca_dev, | 6976 | static void sd_pkt_scan(struct gspca_dev *gspca_dev, |
6977 | struct gspca_frame *frame, | 6977 | u8 *data, |
6978 | __u8 *data, | ||
6979 | int len) | 6978 | int len) |
6980 | { | 6979 | { |
6981 | struct sd *sd = (struct sd *) gspca_dev; | 6980 | struct sd *sd = (struct sd *) gspca_dev; |
6982 | 6981 | ||
6983 | if (data[0] == 0xff && data[1] == 0xd8) { /* start of frame */ | 6982 | if (data[0] == 0xff && data[1] == 0xd8) { /* start of frame */ |
6984 | frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame, | 6983 | gspca_frame_add(gspca_dev, LAST_PACKET, |
6985 | data, 0); | 6984 | NULL, 0); |
6986 | /* put the JPEG header in the new frame */ | 6985 | /* put the JPEG header in the new frame */ |
6987 | gspca_frame_add(gspca_dev, FIRST_PACKET, frame, | 6986 | gspca_frame_add(gspca_dev, FIRST_PACKET, |
6988 | sd->jpeg_hdr, JPEG_HDR_SZ); | 6987 | sd->jpeg_hdr, JPEG_HDR_SZ); |
6989 | 6988 | ||
6990 | /* remove the webcam's header: | 6989 | /* remove the webcam's header: |
@@ -6996,7 +6995,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, | |||
6996 | data += 18; | 6995 | data += 18; |
6997 | len -= 18; | 6996 | len -= 18; |
6998 | } | 6997 | } |
6999 | gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len); | 6998 | gspca_frame_add(gspca_dev, INTER_PACKET, data, len); |
7000 | } | 6999 | } |
7001 | 7000 | ||
7002 | static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val) | 7001 | static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val) |