diff options
Diffstat (limited to 'drivers/media/video/gspca/mars.c')
-rw-r--r-- | drivers/media/video/gspca/mars.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c index de769caf013d..9cf8d68c71bf 100644 --- a/drivers/media/video/gspca/mars.c +++ b/drivers/media/video/gspca/mars.c | |||
@@ -325,8 +325,7 @@ static void sd_stop0(struct gspca_dev *gspca_dev) | |||
325 | } | 325 | } |
326 | 326 | ||
327 | static void sd_pkt_scan(struct gspca_dev *gspca_dev, | 327 | static void sd_pkt_scan(struct gspca_dev *gspca_dev, |
328 | struct gspca_frame *frame, /* target */ | 328 | u8 *data, /* isoc packet */ |
329 | __u8 *data, /* isoc packet */ | ||
330 | int len) /* iso packet length */ | 329 | int len) /* iso packet length */ |
331 | { | 330 | { |
332 | struct sd *sd = (struct sd *) gspca_dev; | 331 | struct sd *sd = (struct sd *) gspca_dev; |
@@ -348,11 +347,11 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, | |||
348 | || data[5 + p] == 0x67) { | 347 | || data[5 + p] == 0x67) { |
349 | PDEBUG(D_PACK, "sof offset: %d len: %d", | 348 | PDEBUG(D_PACK, "sof offset: %d len: %d", |
350 | p, len); | 349 | p, len); |
351 | frame = gspca_frame_add(gspca_dev, LAST_PACKET, | 350 | gspca_frame_add(gspca_dev, LAST_PACKET, |
352 | frame, data, p); | 351 | data, p); |
353 | 352 | ||
354 | /* put the JPEG header */ | 353 | /* put the JPEG header */ |
355 | gspca_frame_add(gspca_dev, FIRST_PACKET, frame, | 354 | gspca_frame_add(gspca_dev, FIRST_PACKET, |
356 | sd->jpeg_hdr, JPEG_HDR_SZ); | 355 | sd->jpeg_hdr, JPEG_HDR_SZ); |
357 | data += p + 16; | 356 | data += p + 16; |
358 | len -= p + 16; | 357 | len -= p + 16; |
@@ -360,7 +359,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, | |||
360 | } | 359 | } |
361 | } | 360 | } |
362 | } | 361 | } |
363 | gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len); | 362 | gspca_frame_add(gspca_dev, INTER_PACKET, data, len); |
364 | } | 363 | } |
365 | 364 | ||
366 | static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val) | 365 | static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val) |