diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-29 22:37:44 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-29 22:37:44 +0200 |
| commit | badc4ee2d5afb0d86e993f3ecf6aa71724cea636 (patch) | |
| tree | 1374f530279681b03dc6275b5bc0648944dfd2c4 /linux/drivers/media/video/uvc/uvc_video.c | |
| parent | 46280e1e8dab9fd0f9d10fbc5f7183c634328bd7 (diff) | |
| download | mediapointer-dvb-s2-badc4ee2d5afb0d86e993f3ecf6aa71724cea636.tar.gz mediapointer-dvb-s2-badc4ee2d5afb0d86e993f3ecf6aa71724cea636.tar.bz2 | |
uvcvideo: Supress spurious "EOF in empty payload" trace message
From: Laurent Pinchart <laurent.pinchart@skynet.be>
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@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/uvc/uvc_video.c')
| -rw-r--r-- | linux/drivers/media/video/uvc/uvc_video.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/uvc/uvc_video.c b/linux/drivers/media/video/uvc/uvc_video.c index 03dc3a519..593aebffe 100644 --- a/linux/drivers/media/video/uvc/uvc_video.c +++ b/linux/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); |