1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c
index b76b0ac0958f..39f5c85dd4b4 100644
--- a/drivers/media/video/uvc/uvc_video.c
+++ b/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;