leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB (7462): bttv: Fix some API non-compliances for some audio/input V4L2 calls

Browse Source 
Thanks to Cyrill Gorcunov <gorcunov@gmail.com> for pointing this
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Mauro Carvalho Chehab 2008-04-01 20:30:24 -03:00
parent 7bf9746d93
commit d69b2e41a5
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/media/video/bt8xx/bttv-driver.c
View File

@ -3117,12 +3117,18 @@ static int bttv_s_crop(struct file *file, void *f, struct v4l2_crop *crop)
static int bttv_g_audio(struct file *file, void *priv, struct v4l2_audio *a) static int bttv_g_audio(struct file *file, void *priv, struct v4l2_audio *a)
{ {
if (unlikely(a->index))
return -EINVAL;
strcpy(a->name, "audio"); strcpy(a->name, "audio");
return 0; return 0;
} }
static int bttv_s_audio(struct file *file, void *priv, struct v4l2_audio *a) static int bttv_s_audio(struct file *file, void *priv, struct v4l2_audio *a)
{ {
if (unlikely(a->index))
return -EINVAL;
return 0; return 0;
} }
@ -3510,7 +3516,7 @@ static int radio_enum_input(struct file *file, void *priv,
return -EINVAL; return -EINVAL;
strcpy(i->name, "Radio"); strcpy(i->name, "Radio");
i->type = V4L2_INPUT_TYPE_TUNER; i->type = V4L2_INPUT_TYPE_TUNER;
return 0; return 0;
} }
@ -3518,10 +3524,9 @@ static int radio_enum_input(struct file *file, void *priv,
static int radio_g_audio(struct file *file, void *priv, static int radio_g_audio(struct file *file, void *priv,
struct v4l2_audio *a) struct v4l2_audio *a)
{ {
if (a->index != 0) if (unlikely(a->index))
return -EINVAL; return -EINVAL;
memset(a, 0, sizeof(*a));
strcpy(a->name, "Radio"); strcpy(a->name, "Radio");
return 0; return 0;
@ -3543,11 +3548,17 @@ static int radio_s_tuner(struct file *file, void *priv,
static int radio_s_audio(struct file *file, void *priv, static int radio_s_audio(struct file *file, void *priv,
struct v4l2_audio *a) struct v4l2_audio *a)
{ {
if (unlikely(a->index))
return -EINVAL;
return 0; return 0;
} }
static int radio_s_input(struct file *filp, void *priv, unsigned int i) static int radio_s_input(struct file *filp, void *priv, unsigned int i)
{ {
if (unlikely(i))
return -EINVAL;
return 0; return 0;
} }