From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Fri, 25 May 2012 15:30:18 +0000 (-0300)
Subject: [media] cx88-blackbird: replace ioctl by unlocked_ioctl
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=fcbd504989739897db0c7bd1c3e55e42c1682e21;p=deliverable%2Flinux.git

[media] cx88-blackbird: replace ioctl by unlocked_ioctl

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index e3bc8f7fcff4..843ffd9e533b 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1089,7 +1089,7 @@ static const struct v4l2_file_operations mpeg_fops =
 	.read	       = mpeg_read,
 	.poll          = mpeg_poll,
 	.mmap	       = mpeg_mmap,
-	.ioctl	       = video_ioctl2,
+	.unlocked_ioctl = video_ioctl2,
 };
 
 static const struct v4l2_ioctl_ops mpeg_ioctl_ops = {