From a197dbc4c931c0b4c2377fa8a0c585c3be72c9eb Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Wed, 5 Sep 2012 12:28:06 -0300 Subject: [PATCH] --- yaml --- r: 331219 b: refs/heads/master c: 5f9c82c021cca74ad9a2dd48353c01bad567815e h: refs/heads/master i: 331217: d434f7d4335897e05fcb299758ada45502c2e2c5 331215: 3775387dadd9762ee2d29172cb2b4771f2cba8cd v: v3 --- [refs] | 2 +- trunk/drivers/media/pci/ivtv/ivtv-streams.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 27c3c1daf66b..23015ec803a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5c46f26591e2c77fa9b78fac202db90428762b0 +refs/heads/master: 5f9c82c021cca74ad9a2dd48353c01bad567815e diff --git a/trunk/drivers/media/pci/ivtv/ivtv-streams.c b/trunk/drivers/media/pci/ivtv/ivtv-streams.c index 3455f465ff13..70dad588a677 100644 --- a/trunk/drivers/media/pci/ivtv/ivtv-streams.c +++ b/trunk/drivers/media/pci/ivtv/ivtv-streams.c @@ -238,6 +238,19 @@ static int ivtv_prep_dev(struct ivtv *itv, int type) s->vdev->release = video_device_release; s->vdev->tvnorms = V4L2_STD_ALL; s->vdev->lock = &itv->serialize_lock; + if (s->type == IVTV_DEC_STREAM_TYPE_VBI) { + v4l2_disable_ioctl(s->vdev, VIDIOC_S_AUDIO); + v4l2_disable_ioctl(s->vdev, VIDIOC_G_AUDIO); + v4l2_disable_ioctl(s->vdev, VIDIOC_ENUMAUDIO); + v4l2_disable_ioctl(s->vdev, VIDIOC_ENUMINPUT); + v4l2_disable_ioctl(s->vdev, VIDIOC_S_INPUT); + v4l2_disable_ioctl(s->vdev, VIDIOC_G_INPUT); + v4l2_disable_ioctl(s->vdev, VIDIOC_S_FREQUENCY); + v4l2_disable_ioctl(s->vdev, VIDIOC_G_FREQUENCY); + v4l2_disable_ioctl(s->vdev, VIDIOC_S_TUNER); + v4l2_disable_ioctl(s->vdev, VIDIOC_G_TUNER); + v4l2_disable_ioctl(s->vdev, VIDIOC_S_STD); + } set_bit(V4L2_FL_USE_FH_PRIO, &s->vdev->flags); ivtv_set_funcs(s->vdev); return 0;