From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun, 14 Nov 2010 16:09:21 +0000 (-0300)
Subject: [media] cafe_ccic: replace ioctl by unlocked_ioctl
X-Git-Tag: v2.6.37-rc7~22^2~11
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20aa5bb9dc4b5aba1b4d0f15aa92c4e83721a343;p=pandora-kernel.git

[media] cafe_ccic: replace ioctl by unlocked_ioctl

Trivial change, approved by Jonathan Corbet <corbet@lwn.net>.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 7bc36670071a..8e6634ce92e7 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -1775,7 +1775,7 @@ static const struct v4l2_file_operations cafe_v4l_fops = {
 	.read = cafe_v4l_read,
 	.poll = cafe_v4l_poll,
 	.mmap = cafe_v4l_mmap,
-	.ioctl = video_ioctl2,
+	.unlocked_ioctl = video_ioctl2,
 };
 
 static const struct v4l2_ioctl_ops cafe_v4l_ioctl_ops = {