summaryrefslogtreecommitdiff
path: root/drivers/media/usb/uvc/uvc_v4l2.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/usb/uvc/uvc_v4l2.c')
-rw-r--r--drivers/media/usb/uvc/uvc_v4l2.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index e8bf4f1..4619fd6 100644
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -531,7 +531,6 @@ static int uvc_v4l2_release(struct file *file)
/* 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);
}
@@ -768,14 +767,6 @@ static int uvc_ioctl_streamon(struct file *file, void *fh,
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;
@@ -794,7 +785,6 @@ static int uvc_ioctl_streamoff(struct file *file, void *fh,
return -EBUSY;
mutex_lock(&stream->mutex);
- uvc_video_enable(stream, 0);
uvc_queue_enable(&stream->queue, 0);
mutex_unlock(&stream->mutex);