From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon, 14 Feb 2011 00:52:02 +0000 (-0300)
Subject: [media] cx88: use unlocked_ioctl for cx88-video.
X-Git-Tag: v2.6.39-rc2~24^2~348
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b618726414f3eb7b0b122e459efe3c5edc36b2fc;p=platform%2Fkernel%2Flinux-stable.git

[media] cx88: use unlocked_ioctl for cx88-video.

cx88-video has locks. don't use the locked ioctl version, as
it is not needed.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 508dabb..e2fc455 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -1672,7 +1672,7 @@ static const struct v4l2_file_operations video_fops =
 	.read	       = video_read,
 	.poll          = video_poll,
 	.mmap	       = video_mmap,
-	.ioctl	       = video_ioctl2,
+	.unlocked_ioctl = video_ioctl2,
 };
 
 static const struct v4l2_ioctl_ops video_ioctl_ops = {
@@ -1722,7 +1722,7 @@ static const struct v4l2_file_operations radio_fops =
 	.owner         = THIS_MODULE,
 	.open          = video_open,
 	.release       = video_release,
-	.ioctl         = video_ioctl2,
+	.unlocked_ioctl = video_ioctl2,
 };
 
 static const struct v4l2_ioctl_ops radio_ioctl_ops = {