diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-09-15 08:22:09 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 01:06:13 -0200 |
| commit | 8979e9d42b87648fd89bcc5d8b3157a8f3f4dfdb (patch) | |
| tree | 13f0c3d88adf84adbc9b61077c99aee527d781c6 /drivers/media | |
| parent | c37db91fd0d42d27141b6c49b768070df29e1c5e (diff) | |
| download | blackbird-op-linux-8979e9d42b87648fd89bcc5d8b3157a8f3f4dfdb.tar.gz blackbird-op-linux-8979e9d42b87648fd89bcc5d8b3157a8f3f4dfdb.zip | |
V4L/DVB: bttv: use unlocked ioctl
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/bt8xx/bttv-driver.c | 14 |
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) 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 = { |
