Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e738785 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 663a4192

drivers/media/video/uvc/uvc_v4l2.c

+0 −4
Original line number Diff line number Diff line
@@ -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);

	}