diff options
Diffstat (limited to 'drivers/media/video/gspca/conex.c')
| -rw-r--r-- | drivers/media/video/gspca/conex.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c index eca003566ae3..2f0b8d621e00 100644 --- a/drivers/media/video/gspca/conex.c +++ b/drivers/media/video/gspca/conex.c | |||
| @@ -888,8 +888,7 @@ static void sd_stop0(struct gspca_dev *gspca_dev) | |||
| 888 | } | 888 | } |
| 889 | 889 | ||
| 890 | static void sd_pkt_scan(struct gspca_dev *gspca_dev, | 890 | static void sd_pkt_scan(struct gspca_dev *gspca_dev, |
| 891 | struct gspca_frame *frame, /* target */ | 891 | u8 *data, /* isoc packet */ |
| 892 | __u8 *data, /* isoc packet */ | ||
| 893 | int len) /* iso packet length */ | 892 | int len) /* iso packet length */ |
| 894 | { | 893 | { |
| 895 | struct sd *sd = (struct sd *) gspca_dev; | 894 | struct sd *sd = (struct sd *) gspca_dev; |
| @@ -897,16 +896,15 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, | |||
| 897 | if (data[0] == 0xff && data[1] == 0xd8) { | 896 | if (data[0] == 0xff && data[1] == 0xd8) { |
| 898 | 897 | ||
| 899 | /* start of frame */ | 898 | /* start of frame */ |
| 900 | frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame, | 899 | gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0); |
| 901 | data, 0); | ||
| 902 | 900 | ||
| 903 | /* put the JPEG header in the new frame */ | 901 | /* put the JPEG header in the new frame */ |
| 904 | gspca_frame_add(gspca_dev, FIRST_PACKET, frame, | 902 | gspca_frame_add(gspca_dev, FIRST_PACKET, |
| 905 | sd->jpeg_hdr, JPEG_HDR_SZ); | 903 | sd->jpeg_hdr, JPEG_HDR_SZ); |
| 906 | data += 2; | 904 | data += 2; |
| 907 | len -= 2; | 905 | len -= 2; |
| 908 | } | 906 | } |
| 909 | gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len); | 907 | gspca_frame_add(gspca_dev, INTER_PACKET, data, len); |
| 910 | } | 908 | } |
| 911 | 909 | ||
| 912 | static void setbrightness(struct gspca_dev*gspca_dev) | 910 | static void setbrightness(struct gspca_dev*gspca_dev) |
