diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-02-13 19:52:02 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-21 19:32:00 -0400 |
commit | b618726414f3eb7b0b122e459efe3c5edc36b2fc (patch) | |
tree | 10fce5f2a195c13108d870e8e8f542c9eeaf8a0a /drivers/media/video | |
parent | 4e105039da20f57958a2f538048a0f1bfb576b8b (diff) |
[media] cx88: use unlocked_ioctl for cx88-video.
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>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/cx88/cx88-video.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index 508dabbed986..e2fc45509b03 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
@@ -1672,7 +1672,7 @@ static const struct v4l2_file_operations video_fops = | |||
1672 | .read = video_read, | 1672 | .read = video_read, |
1673 | .poll = video_poll, | 1673 | .poll = video_poll, |
1674 | .mmap = video_mmap, | 1674 | .mmap = video_mmap, |
1675 | .ioctl = video_ioctl2, | 1675 | .unlocked_ioctl = video_ioctl2, |
1676 | }; | 1676 | }; |
1677 | 1677 | ||
1678 | static const struct v4l2_ioctl_ops video_ioctl_ops = { | 1678 | static const struct v4l2_ioctl_ops video_ioctl_ops = { |
@@ -1722,7 +1722,7 @@ static const struct v4l2_file_operations radio_fops = | |||
1722 | .owner = THIS_MODULE, | 1722 | .owner = THIS_MODULE, |
1723 | .open = video_open, | 1723 | .open = video_open, |
1724 | .release = video_release, | 1724 | .release = video_release, |
1725 | .ioctl = video_ioctl2, | 1725 | .unlocked_ioctl = video_ioctl2, |
1726 | }; | 1726 | }; |
1727 | 1727 | ||
1728 | static const struct v4l2_ioctl_ops radio_ioctl_ops = { | 1728 | static const struct v4l2_ioctl_ops radio_ioctl_ops = { |