diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-02-13 21:52:02 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-21 20:32:00 -0300 |
| commit | b618726414f3eb7b0b122e459efe3c5edc36b2fc (patch) | |
| tree | 10fce5f2a195c13108d870e8e8f542c9eeaf8a0a | |
| parent | 4e105039da20f57958a2f538048a0f1bfb576b8b (diff) | |
| download | blackbird-op-linux-b618726414f3eb7b0b122e459efe3c5edc36b2fc.tar.gz blackbird-op-linux-b618726414f3eb7b0b122e459efe3c5edc36b2fc.zip | |
[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>
| -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 = .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 = { |
