diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/uvc/uvc_video.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c index 03dc3a519e4c..593aebffe57d 100644 --- a/drivers/media/video/uvc/uvc_video.c +++ b/drivers/media/video/uvc/uvc_video.c | |||
@@ -455,7 +455,8 @@ static void uvc_video_decode_isoc(struct urb *urb, | |||
455 | urb->iso_frame_desc[i].actual_length - ret); | 455 | urb->iso_frame_desc[i].actual_length - ret); |
456 | 456 | ||
457 | /* Process the header again. */ | 457 | /* Process the header again. */ |
458 | uvc_video_decode_end(video, buf, mem, ret); | 458 | uvc_video_decode_end(video, buf, mem, |
459 | urb->iso_frame_desc[i].actual_length); | ||
459 | 460 | ||
460 | if (buf->state == UVC_BUF_STATE_DONE || | 461 | if (buf->state == UVC_BUF_STATE_DONE || |
461 | buf->state == UVC_BUF_STATE_ERROR) | 462 | buf->state == UVC_BUF_STATE_ERROR) |
@@ -512,7 +513,7 @@ static void uvc_video_decode_bulk(struct urb *urb, | |||
512 | video->bulk.payload_size >= video->bulk.max_payload_size) { | 513 | video->bulk.payload_size >= video->bulk.max_payload_size) { |
513 | if (!video->bulk.skip_payload && buf != NULL) { | 514 | if (!video->bulk.skip_payload && buf != NULL) { |
514 | uvc_video_decode_end(video, buf, video->bulk.header, | 515 | uvc_video_decode_end(video, buf, video->bulk.header, |
515 | video->bulk.header_size); | 516 | video->bulk.payload_size); |
516 | if (buf->state == UVC_BUF_STATE_DONE || | 517 | if (buf->state == UVC_BUF_STATE_DONE || |
517 | buf->state == UVC_BUF_STATE_ERROR) | 518 | buf->state == UVC_BUF_STATE_ERROR) |
518 | buf = uvc_queue_next_buffer(&video->queue, buf); | 519 | buf = uvc_queue_next_buffer(&video->queue, buf); |