diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-06-09 10:48:53 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-07-06 17:27:05 -0300 |
| commit | 074689d692e129082e1846e71870a0c95c1eb3eb (patch) | |
| tree | 8a1c37785b8dfb98a3b2e522c92e9eb2e7f27c40 /drivers/media/video/ivtv/ivtv-streams.c | |
| parent | 4a085168b59ec0fb18eb7fa023dcc47f4db14655 (diff) | |
| download | talos-obmc-linux-074689d692e129082e1846e71870a0c95c1eb3eb.tar.gz talos-obmc-linux-074689d692e129082e1846e71870a0c95c1eb3eb.zip | |
[media] ivtv: don't mess with vfd->debug
This is now controlled by sysfs.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
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 6738592aa35d..87990c5f0910 100644 --- a/drivers/media/video/ivtv/ivtv-streams.c +++ b/drivers/media/video/ivtv/ivtv-streams.c @@ -50,7 +50,7 @@ static const struct v4l2_file_operations ivtv_v4l2_enc_fops = { .read = ivtv_v4l2_read, .write = ivtv_v4l2_write, .open = ivtv_v4l2_open, - .unlocked_ioctl = ivtv_v4l2_ioctl, + .unlocked_ioctl = video_ioctl2, .release = ivtv_v4l2_close, .poll = ivtv_v4l2_enc_poll, }; @@ -60,7 +60,7 @@ static const struct v4l2_file_operations ivtv_v4l2_dec_fops = { .read = ivtv_v4l2_read, .write = ivtv_v4l2_write, .open = ivtv_v4l2_open, - .unlocked_ioctl = ivtv_v4l2_ioctl, + .unlocked_ioctl = video_ioctl2, .release = ivtv_v4l2_close, .poll = ivtv_v4l2_dec_poll, }; |
