diff options
Diffstat (limited to 'drivers/media/video/gspca/w996Xcf.c')
-rw-r--r-- | drivers/media/video/gspca/w996Xcf.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/media/video/gspca/w996Xcf.c b/drivers/media/video/gspca/w996Xcf.c index 4f9add79ce13..2fffe203bed8 100644 --- a/drivers/media/video/gspca/w996Xcf.c +++ b/drivers/media/video/gspca/w996Xcf.c | |||
@@ -576,8 +576,7 @@ static void w9968cf_stop0(struct sd *sd) | |||
576 | to be precise it sends: SOI, SOF, DRI, SOS, Y-data, SOS, U-data, SOS, | 576 | to be precise it sends: SOI, SOF, DRI, SOS, Y-data, SOS, U-data, SOS, |
577 | V-data, EOI. */ | 577 | V-data, EOI. */ |
578 | static void w9968cf_pkt_scan(struct gspca_dev *gspca_dev, | 578 | static void w9968cf_pkt_scan(struct gspca_dev *gspca_dev, |
579 | struct gspca_frame *frame, /* target */ | 579 | u8 *data, /* isoc packet */ |
580 | __u8 *data, /* isoc packet */ | ||
581 | int len) /* iso packet length */ | 580 | int len) /* iso packet length */ |
582 | { | 581 | { |
583 | struct sd *sd = (struct sd *) gspca_dev; | 582 | struct sd *sd = (struct sd *) gspca_dev; |
@@ -587,9 +586,9 @@ static void w9968cf_pkt_scan(struct gspca_dev *gspca_dev, | |||
587 | if (len >= 2 && | 586 | if (len >= 2 && |
588 | data[0] == 0xff && | 587 | data[0] == 0xff && |
589 | data[1] == 0xd8) { | 588 | data[1] == 0xd8) { |
590 | frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame, | 589 | gspca_frame_add(gspca_dev, LAST_PACKET, |
591 | NULL, 0); | 590 | NULL, 0); |
592 | gspca_frame_add(gspca_dev, FIRST_PACKET, frame, | 591 | gspca_frame_add(gspca_dev, FIRST_PACKET, |
593 | sd->jpeg_hdr, JPEG_HDR_SZ); | 592 | sd->jpeg_hdr, JPEG_HDR_SZ); |
594 | /* Strip the ff d8, our own header (which adds | 593 | /* Strip the ff d8, our own header (which adds |
595 | huffman and quantization tables) already has this */ | 594 | huffman and quantization tables) already has this */ |
@@ -599,12 +598,12 @@ static void w9968cf_pkt_scan(struct gspca_dev *gspca_dev, | |||
599 | } else { | 598 | } else { |
600 | /* In UYVY mode an empty packet signals EOF */ | 599 | /* In UYVY mode an empty packet signals EOF */ |
601 | if (gspca_dev->empty_packet) { | 600 | if (gspca_dev->empty_packet) { |
602 | frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame, | 601 | gspca_frame_add(gspca_dev, LAST_PACKET, |
603 | NULL, 0); | 602 | NULL, 0); |
604 | gspca_frame_add(gspca_dev, FIRST_PACKET, frame, | 603 | gspca_frame_add(gspca_dev, FIRST_PACKET, |
605 | NULL, 0); | 604 | NULL, 0); |
606 | gspca_dev->empty_packet = 0; | 605 | gspca_dev->empty_packet = 0; |
607 | } | 606 | } |
608 | } | 607 | } |
609 | gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len); | 608 | gspca_frame_add(gspca_dev, INTER_PACKET, data, len); |
610 | } | 609 | } |