---

yaml --- r: 320107 b: refs/heads/master c: c854a48 h: refs/heads/master i: 320105: 1a63cc4 320103: c596774 v: v3
git-mirror · Jul 6, 2012 · b624da7 · b624da7
1 parent ffc63a0
commit b624da7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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;