From d434f7d4335897e05fcb299758ada45502c2e2c5 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Mon, 1 Oct 2012 06:45:36 -0300 Subject: [PATCH] --- yaml --- r: 331217 b: refs/heads/master c: dff274fd86e401880d2d10c1dd7fa1fcb6d2bdbc h: refs/heads/master i: 331215: 3775387dadd9762ee2d29172cb2b4771f2cba8cd v: v3 --- [refs] | 2 +- trunk/drivers/media/pci/ivtv/ivtv-driver.c | 1 + trunk/drivers/media/pci/ivtv/ivtv-ioctl.c | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 594fa05f0e5f..60448ff0c746 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7eaf49667e23a11a1f6ec88dad51ad0e93b1445d +refs/heads/master: dff274fd86e401880d2d10c1dd7fa1fcb6d2bdbc diff --git a/trunk/drivers/media/pci/ivtv/ivtv-driver.c b/trunk/drivers/media/pci/ivtv/ivtv-driver.c index eed95a396665..74e9a5032364 100644 --- a/trunk/drivers/media/pci/ivtv/ivtv-driver.c +++ b/trunk/drivers/media/pci/ivtv/ivtv-driver.c @@ -1325,6 +1325,7 @@ int ivtv_init_on_first_open(struct ivtv *itv) int video_input; fh.itv = itv; + fh.type = IVTV_ENC_STREAM_TYPE_MPG; if (test_bit(IVTV_F_I_FAILED, &itv->i_flags)) return -ENXIO; diff --git a/trunk/drivers/media/pci/ivtv/ivtv-ioctl.c b/trunk/drivers/media/pci/ivtv/ivtv-ioctl.c index e5ce970266f3..5537c8842075 100644 --- a/trunk/drivers/media/pci/ivtv/ivtv-ioctl.c +++ b/trunk/drivers/media/pci/ivtv/ivtv-ioctl.c @@ -1064,7 +1064,10 @@ static int ivtv_s_output(struct file *file, void *fh, unsigned int outp) static int ivtv_g_frequency(struct file *file, void *fh, struct v4l2_frequency *vf) { struct ivtv *itv = fh2id(fh)->itv; + struct ivtv_stream *s = &itv->streams[fh2id(fh)->type]; + if (s->vdev->vfl_dir) + return -ENOTTY; if (vf->tuner != 0) return -EINVAL; @@ -1075,7 +1078,10 @@ static int ivtv_g_frequency(struct file *file, void *fh, struct v4l2_frequency * int ivtv_s_frequency(struct file *file, void *fh, struct v4l2_frequency *vf) { struct ivtv *itv = fh2id(fh)->itv; + struct ivtv_stream *s = &itv->streams[fh2id(fh)->type]; + if (s->vdev->vfl_dir) + return -ENOTTY; if (vf->tuner != 0) return -EINVAL;