aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/spca561.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/gspca/spca561.c')
-rw-r--r--drivers/media/video/gspca/spca561.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c
index 27e82b35f3e7..58c2f0039af1 100644
--- a/drivers/media/video/gspca/spca561.c
+++ b/drivers/media/video/gspca/spca561.c
@@ -779,8 +779,7 @@ static void do_autogain(struct gspca_dev *gspca_dev)
779} 779}
780 780
781static void sd_pkt_scan(struct gspca_dev *gspca_dev, 781static void sd_pkt_scan(struct gspca_dev *gspca_dev,
782 struct gspca_frame *frame, /* target */ 782 u8 *data, /* isoc packet */
783 __u8 *data, /* isoc packet */
784 int len) /* iso packet length */ 783 int len) /* iso packet length */
785{ 784{
786 struct sd *sd = (struct sd *) gspca_dev; 785 struct sd *sd = (struct sd *) gspca_dev;
@@ -788,12 +787,10 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
788 len--; 787 len--;
789 switch (*data++) { /* sequence number */ 788 switch (*data++) { /* sequence number */
790 case 0: /* start of frame */ 789 case 0: /* start of frame */
791 frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame, 790 gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0);
792 data, 0);
793 if (data[1] & 0x10) { 791 if (data[1] & 0x10) {
794 /* compressed bayer */ 792 /* compressed bayer */
795 gspca_frame_add(gspca_dev, FIRST_PACKET, 793 gspca_frame_add(gspca_dev, FIRST_PACKET, data, len);
796 frame, data, len);
797 } else { 794 } else {
798 /* raw bayer (with a header, which we skip) */ 795 /* raw bayer (with a header, which we skip) */
799 if (sd->chip_revision == Rev012A) { 796 if (sd->chip_revision == Rev012A) {
@@ -803,14 +800,13 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
803 data += 16; 800 data += 16;
804 len -= 16; 801 len -= 16;
805 } 802 }
806 gspca_frame_add(gspca_dev, FIRST_PACKET, 803 gspca_frame_add(gspca_dev, FIRST_PACKET, data, len);
807 frame, data, len);
808 } 804 }
809 return; 805 return;
810 case 0xff: /* drop (empty mpackets) */ 806 case 0xff: /* drop (empty mpackets) */
811 return; 807 return;
812 } 808 }
813 gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len); 809 gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
814} 810}
815 811
816/* rev 72a only */ 812/* rev 72a only */