diff options
Diffstat (limited to 'drivers/media/video/gspca/spca500.c')
-rw-r--r-- | drivers/media/video/gspca/spca500.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c index fab7ef85a6c1..8bd844d319ea 100644 --- a/drivers/media/video/gspca/spca500.c +++ b/drivers/media/video/gspca/spca500.c | |||
@@ -899,8 +899,7 @@ static void sd_stop0(struct gspca_dev *gspca_dev) | |||
899 | } | 899 | } |
900 | 900 | ||
901 | static void sd_pkt_scan(struct gspca_dev *gspca_dev, | 901 | static void sd_pkt_scan(struct gspca_dev *gspca_dev, |
902 | struct gspca_frame *frame, /* target */ | 902 | u8 *data, /* isoc packet */ |
903 | __u8 *data, /* isoc packet */ | ||
904 | int len) /* iso packet length */ | 903 | int len) /* iso packet length */ |
905 | { | 904 | { |
906 | struct sd *sd = (struct sd *) gspca_dev; | 905 | struct sd *sd = (struct sd *) gspca_dev; |
@@ -913,11 +912,11 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, | |||
913 | /* gspca_dev->last_packet_type = DISCARD_PACKET; */ | 912 | /* gspca_dev->last_packet_type = DISCARD_PACKET; */ |
914 | return; | 913 | return; |
915 | } | 914 | } |
916 | frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame, | 915 | gspca_frame_add(gspca_dev, LAST_PACKET, |
917 | ffd9, 2); | 916 | ffd9, 2); |
918 | 917 | ||
919 | /* put the JPEG header in the new frame */ | 918 | /* put the JPEG header in the new frame */ |
920 | gspca_frame_add(gspca_dev, FIRST_PACKET, frame, | 919 | gspca_frame_add(gspca_dev, FIRST_PACKET, |
921 | sd->jpeg_hdr, JPEG_HDR_SZ); | 920 | sd->jpeg_hdr, JPEG_HDR_SZ); |
922 | 921 | ||
923 | data += SPCA500_OFFSET_DATA; | 922 | data += SPCA500_OFFSET_DATA; |
@@ -931,7 +930,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, | |||
931 | i = 0; | 930 | i = 0; |
932 | do { | 931 | do { |
933 | if (data[i] == 0xff) { | 932 | if (data[i] == 0xff) { |
934 | gspca_frame_add(gspca_dev, INTER_PACKET, frame, | 933 | gspca_frame_add(gspca_dev, INTER_PACKET, |
935 | data, i + 1); | 934 | data, i + 1); |
936 | len -= i; | 935 | len -= i; |
937 | data += i; | 936 | data += i; |
@@ -940,7 +939,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, | |||
940 | } | 939 | } |
941 | i++; | 940 | i++; |
942 | } while (i < len); | 941 | } while (i < len); |
943 | gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len); | 942 | gspca_frame_add(gspca_dev, INTER_PACKET, data, len); |
944 | } | 943 | } |
945 | 944 | ||
946 | static void setbrightness(struct gspca_dev *gspca_dev) | 945 | static void setbrightness(struct gspca_dev *gspca_dev) |