diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-10-18 12:42:24 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-21 12:31:28 -0400 |
| commit | 09882f0044b7cf6e506c82a5182ad768ebb660f2 (patch) | |
| tree | 208d75bd3fa03ba4d950eb5f67d1d31d42903852 /drivers/media/video/ivtv/ivtv-streams.c | |
| parent | d5fbf32f381ad841d9d9537aa1b6f74796703361 (diff) | |
V4L/DVB (9325): ivtv: switch to unlocked_ioctl.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-streams.c')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-streams.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c index 5bbf31e39304..9b7aa79eb267 100644 --- a/drivers/media/video/ivtv/ivtv-streams.c +++ b/drivers/media/video/ivtv/ivtv-streams.c | |||
| @@ -48,7 +48,7 @@ static const struct file_operations ivtv_v4l2_enc_fops = { | |||
| 48 | .read = ivtv_v4l2_read, | 48 | .read = ivtv_v4l2_read, |
| 49 | .write = ivtv_v4l2_write, | 49 | .write = ivtv_v4l2_write, |
| 50 | .open = ivtv_v4l2_open, | 50 | .open = ivtv_v4l2_open, |
| 51 | .ioctl = ivtv_v4l2_ioctl, | 51 | .unlocked_ioctl = ivtv_v4l2_ioctl, |
| 52 | .compat_ioctl = v4l_compat_ioctl32, | 52 | .compat_ioctl = v4l_compat_ioctl32, |
| 53 | .release = ivtv_v4l2_close, | 53 | .release = ivtv_v4l2_close, |
| 54 | .poll = ivtv_v4l2_enc_poll, | 54 | .poll = ivtv_v4l2_enc_poll, |
| @@ -59,7 +59,7 @@ static const struct file_operations ivtv_v4l2_dec_fops = { | |||
| 59 | .read = ivtv_v4l2_read, | 59 | .read = ivtv_v4l2_read, |
| 60 | .write = ivtv_v4l2_write, | 60 | .write = ivtv_v4l2_write, |
| 61 | .open = ivtv_v4l2_open, | 61 | .open = ivtv_v4l2_open, |
| 62 | .ioctl = ivtv_v4l2_ioctl, | 62 | .unlocked_ioctl = ivtv_v4l2_ioctl, |
| 63 | .compat_ioctl = v4l_compat_ioctl32, | 63 | .compat_ioctl = v4l_compat_ioctl32, |
| 64 | .release = ivtv_v4l2_close, | 64 | .release = ivtv_v4l2_close, |
| 65 | .poll = ivtv_v4l2_dec_poll, | 65 | .poll = ivtv_v4l2_dec_poll, |