---

yaml --- r: 173951 b: refs/heads/master c: 4e73878 h: refs/heads/master i: 173949: a500d44 173947: 0ceb936 173943: afafc20 173935: b2101fe 173919: cf97943 173887: 07811ff 173823: 1b9ddb2 v: v3
git-mirror · Dec 5, 2009 · 008969c · 008969c
1 parent 83130f8
commit 008969c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -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);
 	}