From 8a8aa5858da46f30cc2d8d1a826fb43f9857618e Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Fri, 29 Aug 2008 17:37:44 -0300 Subject: [PATCH] --- yaml --- r: 113879 b: refs/heads/master c: 08ebd003d90955d78b58bb348a098fee301b8a82 h: refs/heads/master i: 113877: fba7daf8652c380157da8194c42cb08956814796 113875: fd2762237aaf2c345416e087b2e02c000c60b8b0 113871: e5700ed5a34b3b07c7a085fd43eb6bc6575d577b v: v3 --- [refs] | 2 +- trunk/drivers/media/video/uvc/uvc_video.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ea17eed12a4e..0f101c8bd855 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22b88d48a08e334d36218ca166749c4e6d644f0c +refs/heads/master: 08ebd003d90955d78b58bb348a098fee301b8a82 diff --git a/trunk/drivers/media/video/uvc/uvc_video.c b/trunk/drivers/media/video/uvc/uvc_video.c index 03dc3a519e4c..593aebffe57d 100644 --- a/trunk/drivers/media/video/uvc/uvc_video.c +++ b/trunk/drivers/media/video/uvc/uvc_video.c @@ -455,7 +455,8 @@ static void uvc_video_decode_isoc(struct urb *urb, urb->iso_frame_desc[i].actual_length - ret); /* Process the header again. */ - uvc_video_decode_end(video, buf, mem, ret); + uvc_video_decode_end(video, buf, mem, + urb->iso_frame_desc[i].actual_length); if (buf->state == UVC_BUF_STATE_DONE || buf->state == UVC_BUF_STATE_ERROR) @@ -512,7 +513,7 @@ static void uvc_video_decode_bulk(struct urb *urb, video->bulk.payload_size >= video->bulk.max_payload_size) { if (!video->bulk.skip_payload && buf != NULL) { uvc_video_decode_end(video, buf, video->bulk.header, - video->bulk.header_size); + video->bulk.payload_size); if (buf->state == UVC_BUF_STATE_DONE || buf->state == UVC_BUF_STATE_ERROR) buf = uvc_queue_next_buffer(&video->queue, buf);