[PATCH] V4L/DVB (8846): uvcvideo: Supress spurious "EOF in empty payload" trace message

Laurent Pinchart laurent.pinchart at skynet.be
Fri Aug 29 21:37:44 BST 2008


Pass the payload size instead of the header size to uvc_video_decode_end() to
avoid generating an extra trace message for each frame.

Signed-off-by: Laurent Pinchart <laurent.pinchart at skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
---
 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 03dc3a5..593aebf 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,
 			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);
-- 
1.5.4.3


--------------070606090601050404000603
Content-Type: text/x-diff;
 name="0005-V4L-DVB-8847-uvcvideo-Add-support-for-a-Bison-El.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename*0="0005-V4L-DVB-8847-uvcvideo-Add-support-for-a-Bison-El.patch"



More information about the kernel-team mailing list