aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-09-15 07:22:09 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:06:13 -0400
commit8979e9d42b87648fd89bcc5d8b3157a8f3f4dfdb (patch)
tree13f0c3d88adf84adbc9b61077c99aee527d781c6
parentc37db91fd0d42d27141b6c49b768070df29e1c5e (diff)
V4L/DVB: bttv: use unlocked ioctl
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/bt8xx/bttv-driver.c14
1 files changed, 7 insertions, 7 deletions
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)
3417 3417
3418static const struct v4l2_file_operations bttv_fops = 3418static const struct v4l2_file_operations bttv_fops =
3419{ 3419{
3420 .owner = THIS_MODULE, 3420 .owner = THIS_MODULE,
3421 .open = bttv_open, 3421 .open = bttv_open,
3422 .release = bttv_release, 3422 .release = bttv_release,
3423 .ioctl = video_ioctl2, 3423 .unlocked_ioctl = video_ioctl2,
3424 .read = bttv_read, 3424 .read = bttv_read,
3425 .mmap = bttv_mmap, 3425 .mmap = bttv_mmap,
3426 .poll = bttv_poll, 3426 .poll = bttv_poll,
3427}; 3427};
3428 3428
3429static const struct v4l2_ioctl_ops bttv_ioctl_ops = { 3429static const struct v4l2_ioctl_ops bttv_ioctl_ops = {