]> git.karo-electronics.de Git - linux-beck.git/commitdiff
V4L/DVB: bttv: use unlocked ioctl
authorMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 15 Sep 2010 11:22:09 +0000 (08:22 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Oct 2010 03:06:13 +0000 (01:06 -0200)
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/bt8xx/bttv-driver.c

index 056888cbc8e72ab0f4e8069b06c55f78b4589530..69a8ad24c0b360ec9b3b96d8a5fda39bfd6164ab 100644 (file)
@@ -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 = {