openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] ivtv: don't allow g/s_frequency for output device nodes 

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2012-10-01 06:45:36 -03:00 committed by Mauro Carvalho Chehab
parent 7eaf49667e
commit dff274fd86
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/pci/ivtv/ivtv-driver.c
View File

@ -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;

6
drivers/media/pci/ivtv/ivtv-ioctl.c
View File

@ -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;