From 008969c12ce2f37bf8820a529a35b9fb7fe7ca82 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Wed, 2 Sep 2009 03:09:02 -0300
Subject: [PATCH] --- yaml --- r: 173951 b: refs/heads/master c:
 4e7387858f35eace117493e4ad69d3b7ccc84a41 h: refs/heads/master i:   173949:
 a500d44abaad5d51f5091d188bc4322afcd222f0   173947:
 0ceb9362bb1b5a2b7091817934351c53cdd8bf53   173943:
 afafc20cc9a374cc0912a4b6cecbc888645dca81   173935:
 b2101fedd61b26a4e70bc17a9a9dab3d9642169d   173919:
 cf97943b2caef0c9efaf4d48044101345a5321a7   173887:
 07811ff53e27ea7c91b6fb45b0b0f1a70a261bd5   173823:
 1b9ddb2b692d0cfef0d631f8954afba3b17301eb v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/video/uvc/uvc_v4l2.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 54452a6919aa..6d2aaee4133d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 663a419203cc9690d16502be509ffb8acc40552a
+refs/heads/master: 4e7387858f35eace117493e4ad69d3b7ccc84a41
diff --git a/trunk/drivers/media/video/uvc/uvc_v4l2.c b/trunk/drivers/media/video/uvc/uvc_v4l2.c
index a2bdd806efab..7c555712411a 100644
--- a/trunk/drivers/media/video/uvc/uvc_v4l2.c
+++ b/trunk/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);
 	}