diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-11-14 11:09:21 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-01 17:10:13 -0500 |
| commit | 20aa5bb9dc4b5aba1b4d0f15aa92c4e83721a343 (patch) | |
| tree | f52a76cc4712c0c2e386c976d10ae04c39423b98 /drivers | |
| parent | ca2621963de3934613f8aa63e19c03b1751707ae (diff) | |
[media] cafe_ccic: replace ioctl by unlocked_ioctl
Trivial change, approved by Jonathan Corbet <corbet@lwn.net>.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/cafe_ccic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c index 7bc36670071a..8e6634ce92e7 100644 --- a/drivers/media/video/cafe_ccic.c +++ b/drivers/media/video/cafe_ccic.c | |||
| @@ -1775,7 +1775,7 @@ static const struct v4l2_file_operations cafe_v4l_fops = { | |||
| 1775 | .read = cafe_v4l_read, | 1775 | .read = cafe_v4l_read, |
| 1776 | .poll = cafe_v4l_poll, | 1776 | .poll = cafe_v4l_poll, |
| 1777 | .mmap = cafe_v4l_mmap, | 1777 | .mmap = cafe_v4l_mmap, |
| 1778 | .ioctl = video_ioctl2, | 1778 | .unlocked_ioctl = video_ioctl2, |
| 1779 | }; | 1779 | }; |
| 1780 | 1780 | ||
| 1781 | static const struct v4l2_ioctl_ops cafe_v4l_ioctl_ops = { | 1781 | static const struct v4l2_ioctl_ops cafe_v4l_ioctl_ops = { |