[media] uvcvideo: Separate video and queue enable/disable operations
In order to make use of the vb2 queue start/stop_streaming operations
the video and queue enable/disable operations need to be split, as the
vb2 queue will need to enable and disable video instead of the other way
around.
Also move buffer queue disable outside of uvc_video_resume() to remove
all queue disable operations out of uvc_video.c.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index a16fe21..e8bf4f1 100644
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -532,6 +532,7 @@
/* Only free resources if this is a privileged handle. */
if (uvc_has_privileges(handle)) {
uvc_video_enable(stream, 0);
+ uvc_queue_enable(&stream->queue, 0);
uvc_free_buffers(&stream->queue);
}
@@ -766,7 +767,15 @@
return -EBUSY;
mutex_lock(&stream->mutex);
+ ret = uvc_queue_enable(&stream->queue, 1);
+ if (ret < 0)
+ goto done;
+
ret = uvc_video_enable(stream, 1);
+ if (ret < 0)
+ uvc_queue_enable(&stream->queue, 0);
+
+done:
mutex_unlock(&stream->mutex);
return ret;
@@ -777,7 +786,6 @@
{
struct uvc_fh *handle = fh;
struct uvc_streaming *stream = handle->stream;
- int ret;
if (type != stream->type)
return -EINVAL;
@@ -786,10 +794,11 @@
return -EBUSY;
mutex_lock(&stream->mutex);
- ret = uvc_video_enable(stream, 0);
+ uvc_video_enable(stream, 0);
+ uvc_queue_enable(&stream->queue, 0);
mutex_unlock(&stream->mutex);
- return ret;
+ return 0;
}
static int uvc_ioctl_enum_input(struct file *file, void *fh,