diff options
Diffstat (limited to 'drivers/media/video/gspca/sunplus.c')
| -rw-r--r-- | drivers/media/video/gspca/sunplus.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c index aa8f995ce04..682652cb7fe 100644 --- a/drivers/media/video/gspca/sunplus.c +++ b/drivers/media/video/gspca/sunplus.c | |||
| @@ -1116,7 +1116,6 @@ static void sd_stop0(struct gspca_dev *gspca_dev) | |||
| 1116 | } | 1116 | } |
| 1117 | 1117 | ||
| 1118 | static void sd_pkt_scan(struct gspca_dev *gspca_dev, | 1118 | static void sd_pkt_scan(struct gspca_dev *gspca_dev, |
| 1119 | struct gspca_frame *frame, /* target */ | ||
| 1120 | u8 *data, /* isoc packet */ | 1119 | u8 *data, /* isoc packet */ |
| 1121 | int len) /* iso packet length */ | 1120 | int len) /* iso packet length */ |
| 1122 | { | 1121 | { |
| @@ -1186,11 +1185,11 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, | |||
| 1186 | break; | 1185 | break; |
| 1187 | } | 1186 | } |
| 1188 | if (sof) { /* start of frame */ | 1187 | if (sof) { /* start of frame */ |
| 1189 | frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame, | 1188 | gspca_frame_add(gspca_dev, LAST_PACKET, |
| 1190 | ffd9, 2); | 1189 | ffd9, 2); |
| 1191 | 1190 | ||
| 1192 | /* put the JPEG header in the new frame */ | 1191 | /* put the JPEG header in the new frame */ |
| 1193 | gspca_frame_add(gspca_dev, FIRST_PACKET, frame, | 1192 | gspca_frame_add(gspca_dev, FIRST_PACKET, |
| 1194 | sd->jpeg_hdr, JPEG_HDR_SZ); | 1193 | sd->jpeg_hdr, JPEG_HDR_SZ); |
| 1195 | } | 1194 | } |
| 1196 | 1195 | ||
| @@ -1198,7 +1197,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, | |||
| 1198 | i = 0; | 1197 | i = 0; |
| 1199 | do { | 1198 | do { |
| 1200 | if (data[i] == 0xff) { | 1199 | if (data[i] == 0xff) { |
| 1201 | gspca_frame_add(gspca_dev, INTER_PACKET, frame, | 1200 | gspca_frame_add(gspca_dev, INTER_PACKET, |
| 1202 | data, i + 1); | 1201 | data, i + 1); |
| 1203 | len -= i; | 1202 | len -= i; |
| 1204 | data += i; | 1203 | data += i; |
| @@ -1207,7 +1206,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, | |||
| 1207 | } | 1206 | } |
| 1208 | i++; | 1207 | i++; |
| 1209 | } while (i < len); | 1208 | } while (i < len); |
| 1210 | gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len); | 1209 | gspca_frame_add(gspca_dev, INTER_PACKET, data, len); |
| 1211 | } | 1210 | } |
| 1212 | 1211 | ||
| 1213 | static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val) | 1212 | static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val) |
