]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] cx88: use unlocked_ioctl for cx88-video.
authorMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 14 Feb 2011 00:52:02 +0000 (21:52 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 21 Mar 2011 23:32:00 +0000 (20:32 -0300)
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>
drivers/media/video/cx88/cx88-video.c

index 508dabbed9868aa95815d77bcd54a576524f0f5e..e2fc45509b030ac9341369dfff09ac1c8d35dbab 100644 (file)
@@ -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 = {