From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Wed, 2 Sep 2009 06:09:02 +0000 (-0300)
Subject: V4L/DVB (13150): uvcvideo: Don't acquire privileges in VIDIOC_TRY_FMT
X-Git-Tag: accepted/tizen/common/20141203.182822~13546^2~264
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4e7387858f35eace117493e4ad69d3b7ccc84a41;p=platform%2Fkernel%2Flinux-arm64.git

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>
---

diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index a2bdd80..7c55571 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,
  * - VIDIOC_S_INPUT
  * - VIDIOC_S_PARM
  * - VIDIOC_S_FMT
- * - VIDIOC_TRY_FMT
  * - VIDIOC_REQBUFS
  */
 static 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)
 	{
 		struct uvc_streaming_control probe;
 
-		if ((ret = uvc_acquire_privileges(handle)) < 0)
-			return ret;
-
 		return uvc_v4l2_try_format(stream, arg, &probe, NULL, NULL);
 	}