---

yaml --- r: 223395 b: refs/heads/master c: 673eb9f h: refs/heads/master i: 223393: 9ac7f47 223391: bd6ba77 v: v3
git-mirror · Dec 1, 2010 · 881f115 · 881f115
1 parent 51c255b
commit 881f115
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6947756dfcecc493062a46e77f6bf51dddb5be75
+refs/heads/master: 673eb9ff33e26ee6f4278cdab06749aef1bbef5b
diff --git a/trunk/drivers/media/video/uvc/uvc_v4l2.c b/trunk/drivers/media/video/uvc/uvc_v4l2.c
@@ -1088,7 +1088,7 @@ const struct v4l2_file_operations uvc_fops = {
 	.owner		= THIS_MODULE,
 	.open		= uvc_v4l2_open,
 	.release	= uvc_v4l2_release,
-	.ioctl		= uvc_v4l2_ioctl,
+	.unlocked_ioctl	= uvc_v4l2_ioctl,
 	.read		= uvc_v4l2_read,
 	.mmap		= uvc_v4l2_mmap,
 	.poll		= uvc_v4l2_poll,