aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/uvc/uvc_v4l2.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2009-09-02 02:09:02 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-05 15:40:35 -0500
commit4e7387858f35eace117493e4ad69d3b7ccc84a41 (patch)
tree9ad5c0e05c13c208485bbe89a61c4967f9e8fda1 /drivers/media/video/uvc/uvc_v4l2.c
parent663a419203cc9690d16502be509ffb8acc40552a (diff)
V4L/DVB (13150): uvcvideo: Don't acquire privileges in VIDIOC_TRY_FMT
The VIDIOC_TRY_FMT ioctl doesn't interfere with video streaming and thus should succeed on an unprivileged file handle. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/uvc/uvc_v4l2.c')
-rw-r--r--drivers/media/video/uvc/uvc_v4l2.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index a2bdd806efab..7c555712411a 100644
--- a/drivers/media/video/uvc/uvc_v4l2.c
+++ b/drivers/media/video/uvc/uvc_v4l2.c
@@ -371,7 +371,6 @@ static int uvc_v4l2_set_streamparm(struct uvc_streaming *stream,
371 * - VIDIOC_S_INPUT 371 * - VIDIOC_S_INPUT
372 * - VIDIOC_S_PARM 372 * - VIDIOC_S_PARM
373 * - VIDIOC_S_FMT 373 * - VIDIOC_S_FMT
374 * - VIDIOC_TRY_FMT
375 * - VIDIOC_REQBUFS 374 * - VIDIOC_REQBUFS
376 */ 375 */
377static int uvc_acquire_privileges(struct uvc_fh *handle) 376static int uvc_acquire_privileges(struct uvc_fh *handle)
@@ -731,9 +730,6 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
731 { 730 {
732 struct uvc_streaming_control probe; 731 struct uvc_streaming_control probe;
733 732
734 if ((ret = uvc_acquire_privileges(handle)) < 0)
735 return ret;
736
737 return uvc_v4l2_try_format(stream, arg, &probe, NULL, NULL); 733 return uvc_v4l2_try_format(stream, arg, &probe, NULL, NULL);
738 } 734 }
739 735