From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 15 Sep 2010 11:22:09 +0000 (-0300)
Subject: V4L/DVB: bttv: use unlocked ioctl
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8979e9d42b87648fd89bcc5d8b3157a8f3f4dfdb;p=openwrt%2Fstaging%2Fblogic.git

V4L/DVB: bttv: use unlocked ioctl

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

diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 056888cbc8e7..69a8ad24c0b3 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -3417,13 +3417,13 @@ bttv_mmap(struct file *file, struct vm_area_struct *vma)
 
 static const struct v4l2_file_operations bttv_fops =
 {
-	.owner	  = THIS_MODULE,
-	.open	  = bttv_open,
-	.release  = bttv_release,
-	.ioctl	  = video_ioctl2,
-	.read	  = bttv_read,
-	.mmap	  = bttv_mmap,
-	.poll     = bttv_poll,
+	.owner		  = THIS_MODULE,
+	.open		  = bttv_open,
+	.release	  = bttv_release,
+	.unlocked_ioctl	  = video_ioctl2,
+	.read		  = bttv_read,
+	.mmap		  = bttv_mmap,
+	.poll		  = bttv_poll,
 };
 
 static const struct v4l2_ioctl_ops bttv_ioctl_ops = {