From b624da79c8c50dd634316e0f941fed29a557e9c8 Mon Sep 17 00:00:00 2001 From: Jayakrishnan Date: Fri, 9 Mar 2012 10:10:49 -0300 Subject: [PATCH] --- yaml --- r: 320107 b: refs/heads/master c: c854a48a97feb94ccd4501593badd1b9907326c2 h: refs/heads/master i: 320105: 1a63cc410fcdc813185fb2ee7b0d5a9a4de786b0 320103: c5967741829cab4e175163a8a0ce0596ec7c044e v: v3 --- [refs] | 2 +- trunk/drivers/media/video/uvc/uvc_video.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0e89ab73d5c2..5f62c24ea9ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7078daa020db5ba501fa3de64b8653c221a640b4 +refs/heads/master: c854a48a97feb94ccd4501593badd1b9907326c2 diff --git a/trunk/drivers/media/video/uvc/uvc_video.c b/trunk/drivers/media/video/uvc/uvc_video.c index b76b0ac0958f..39f5c85dd4b4 100644 --- a/trunk/drivers/media/video/uvc/uvc_video.c +++ b/trunk/drivers/media/video/uvc/uvc_video.c @@ -1188,7 +1188,11 @@ static void uvc_video_decode_bulk(struct urb *urb, struct uvc_streaming *stream, u8 *mem; int len, ret; - if (urb->actual_length == 0) + /* + * Ignore ZLPs if they're not part of a frame, otherwise process them + * to trigger the end of payload detection. + */ + if (urb->actual_length == 0 && stream->bulk.header_size == 0) return; mem = urb->transfer_buffer;