diff options
Diffstat (limited to 'drivers/media/video/gspca/sn9c20x.c')
-rw-r--r-- | drivers/media/video/gspca/sn9c20x.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/media/video/gspca/sn9c20x.c b/drivers/media/video/gspca/sn9c20x.c index cdad3db33367..b1944a7cbb0f 100644 --- a/drivers/media/video/gspca/sn9c20x.c +++ b/drivers/media/video/gspca/sn9c20x.c | |||
@@ -2342,7 +2342,6 @@ static void sd_dqcallback(struct gspca_dev *gspca_dev) | |||
2342 | } | 2342 | } |
2343 | 2343 | ||
2344 | static void sd_pkt_scan(struct gspca_dev *gspca_dev, | 2344 | static void sd_pkt_scan(struct gspca_dev *gspca_dev, |
2345 | struct gspca_frame *frame, /* target */ | ||
2346 | u8 *data, /* isoc packet */ | 2345 | u8 *data, /* isoc packet */ |
2347 | int len) /* iso packet length */ | 2346 | int len) /* iso packet length */ |
2348 | { | 2347 | { |
@@ -2378,22 +2377,22 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, | |||
2378 | avg_lum >>= 9; | 2377 | avg_lum >>= 9; |
2379 | atomic_set(&sd->avg_lum, avg_lum); | 2378 | atomic_set(&sd->avg_lum, avg_lum); |
2380 | gspca_frame_add(gspca_dev, LAST_PACKET, | 2379 | gspca_frame_add(gspca_dev, LAST_PACKET, |
2381 | frame, data, len); | 2380 | data, len); |
2382 | return; | 2381 | return; |
2383 | } | 2382 | } |
2384 | if (gspca_dev->last_packet_type == LAST_PACKET) { | 2383 | if (gspca_dev->last_packet_type == LAST_PACKET) { |
2385 | if (gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv | 2384 | if (gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv |
2386 | & MODE_JPEG) { | 2385 | & MODE_JPEG) { |
2387 | gspca_frame_add(gspca_dev, FIRST_PACKET, frame, | 2386 | gspca_frame_add(gspca_dev, FIRST_PACKET, |
2388 | sd->jpeg_hdr, JPEG_HDR_SZ); | 2387 | sd->jpeg_hdr, JPEG_HDR_SZ); |
2389 | gspca_frame_add(gspca_dev, INTER_PACKET, frame, | 2388 | gspca_frame_add(gspca_dev, INTER_PACKET, |
2390 | data, len); | 2389 | data, len); |
2391 | } else { | 2390 | } else { |
2392 | gspca_frame_add(gspca_dev, FIRST_PACKET, frame, | 2391 | gspca_frame_add(gspca_dev, FIRST_PACKET, |
2393 | data, len); | 2392 | data, len); |
2394 | } | 2393 | } |
2395 | } else { | 2394 | } else { |
2396 | gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len); | 2395 | gspca_frame_add(gspca_dev, INTER_PACKET, data, len); |
2397 | } | 2396 | } |
2398 | } | 2397 | } |
2399 | 2398 | ||