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

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@skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Laurent Pinchart 2008-08-29 17:37:44 -03:00 committed by Mauro Carvalho Chehab
parent 22b88d48a0
commit 08ebd003d9
1 changed files with 3 additions and 2 deletions

View File

@ -455,7 +455,8 @@ static void uvc_video_decode_isoc(struct urb *urb,
urb->iso_frame_desc[i].actual_length - ret); urb->iso_frame_desc[i].actual_length - ret);
/* Process the header again. */ /* 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 || if (buf->state == UVC_BUF_STATE_DONE ||
buf->state == UVC_BUF_STATE_ERROR) 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) { video->bulk.payload_size >= video->bulk.max_payload_size) {
if (!video->bulk.skip_payload && buf != NULL) { if (!video->bulk.skip_payload && buf != NULL) {
uvc_video_decode_end(video, buf, video->bulk.header, uvc_video_decode_end(video, buf, video->bulk.header,
video->bulk.header_size); video->bulk.payload_size);
if (buf->state == UVC_BUF_STATE_DONE || if (buf->state == UVC_BUF_STATE_DONE ||
buf->state == UVC_BUF_STATE_ERROR) buf->state == UVC_BUF_STATE_ERROR)
buf = uvc_queue_next_buffer(&video->queue, buf); buf = uvc_queue_next_buffer(&video->queue, buf);