From 80da0409a298fcb645f4227c27b2d3a6a11f6d56 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 15 Sep 2008 22:24:29 -0300 Subject: [PATCH] --- yaml --- r: 113990 b: refs/heads/master c: d63beb9ef004ff9587b3c466361276254d57d7a7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/uvc/uvc_v4l2.c | 4 ---- trunk/drivers/media/video/uvc/uvc_video.c | 5 +++++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cf5bb2b74911..04fac46d64c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80845e1078463913f8b456e45f1fae886687c363 +refs/heads/master: d63beb9ef004ff9587b3c466361276254d57d7a7 diff --git a/trunk/drivers/media/video/uvc/uvc_v4l2.c b/trunk/drivers/media/video/uvc/uvc_v4l2.c index d4758c8e13ad..78e4c4e09d89 100644 --- a/trunk/drivers/media/video/uvc/uvc_v4l2.c +++ b/trunk/drivers/media/video/uvc/uvc_v4l2.c @@ -842,10 +842,6 @@ static int uvc_v4l2_do_ioctl(struct inode *inode, struct file *file, if (ret < 0) return ret; - if (!(video->streaming->cur_format->flags & - UVC_FMT_FLAG_COMPRESSED)) - video->queue.flags |= UVC_QUEUE_DROP_INCOMPLETE; - rb->count = ret; ret = 0; break; diff --git a/trunk/drivers/media/video/uvc/uvc_video.c b/trunk/drivers/media/video/uvc/uvc_video.c index 593aebffe57d..b7bb23820d80 100644 --- a/trunk/drivers/media/video/uvc/uvc_video.c +++ b/trunk/drivers/media/video/uvc/uvc_video.c @@ -971,6 +971,11 @@ int uvc_video_enable(struct uvc_video_device *video, int enable) return 0; } + if (video->streaming->cur_format->flags & UVC_FMT_FLAG_COMPRESSED) + video->queue.flags &= ~UVC_QUEUE_DROP_INCOMPLETE; + else + video->queue.flags |= UVC_QUEUE_DROP_INCOMPLETE; + if ((ret = uvc_queue_enable(&video->queue, 1)) < 0) return ret;