diff options
Diffstat (limited to 'drivers/media/video/gspca/sonixj.c')
-rw-r--r-- | drivers/media/video/gspca/sonixj.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c index 5f82efb93d9b..282c707e5e81 100644 --- a/drivers/media/video/gspca/sonixj.c +++ b/drivers/media/video/gspca/sonixj.c | |||
@@ -1993,7 +1993,6 @@ static void do_autogain(struct gspca_dev *gspca_dev) | |||
1993 | /* scan the URB packets */ | 1993 | /* scan the URB packets */ |
1994 | /* This function is run at interrupt level. */ | 1994 | /* This function is run at interrupt level. */ |
1995 | static void sd_pkt_scan(struct gspca_dev *gspca_dev, | 1995 | static void sd_pkt_scan(struct gspca_dev *gspca_dev, |
1996 | struct gspca_frame *frame, /* target */ | ||
1997 | u8 *data, /* isoc packet */ | 1996 | u8 *data, /* isoc packet */ |
1998 | int len) /* iso packet length */ | 1997 | int len) /* iso packet length */ |
1999 | { | 1998 | { |
@@ -2005,7 +2004,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, | |||
2005 | 2004 | ||
2006 | /* end of frame */ | 2005 | /* end of frame */ |
2007 | gspca_frame_add(gspca_dev, LAST_PACKET, | 2006 | gspca_frame_add(gspca_dev, LAST_PACKET, |
2008 | frame, data, sof + 2); | 2007 | data, sof + 2); |
2009 | if (sd->ag_cnt < 0) | 2008 | if (sd->ag_cnt < 0) |
2010 | return; | 2009 | return; |
2011 | /* w1 w2 w3 */ | 2010 | /* w1 w2 w3 */ |
@@ -2028,10 +2027,10 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, | |||
2028 | if (gspca_dev->last_packet_type == LAST_PACKET) { | 2027 | if (gspca_dev->last_packet_type == LAST_PACKET) { |
2029 | 2028 | ||
2030 | /* put the JPEG 422 header */ | 2029 | /* put the JPEG 422 header */ |
2031 | gspca_frame_add(gspca_dev, FIRST_PACKET, frame, | 2030 | gspca_frame_add(gspca_dev, FIRST_PACKET, |
2032 | sd->jpeg_hdr, JPEG_HDR_SZ); | 2031 | sd->jpeg_hdr, JPEG_HDR_SZ); |
2033 | } | 2032 | } |
2034 | gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len); | 2033 | gspca_frame_add(gspca_dev, INTER_PACKET, data, len); |
2035 | } | 2034 | } |
2036 | 2035 | ||
2037 | static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val) | 2036 | static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val) |