mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-24 21:24:00 +08:00
V4L/DVB (7462): bttv: Fix some API non-compliances for some audio/input V4L2 calls
Thanks to Cyrill Gorcunov <gorcunov@gmail.com> for pointing this Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
7bf9746d93
commit
d69b2e41a5
@ -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)
|
||||
{
|
||||
if (unlikely(a->index))
|
||||
return -EINVAL;
|
||||
|
||||
strcpy(a->name, "audio");
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int bttv_s_audio(struct file *file, void *priv, struct v4l2_audio *a)
|
||||
{
|
||||
if (unlikely(a->index))
|
||||
return -EINVAL;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -3510,7 +3516,7 @@ static int radio_enum_input(struct file *file, void *priv,
|
||||
return -EINVAL;
|
||||
|
||||
strcpy(i->name, "Radio");
|
||||
i->type = V4L2_INPUT_TYPE_TUNER;
|
||||
i->type = V4L2_INPUT_TYPE_TUNER;
|
||||
|
||||
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,
|
||||
struct v4l2_audio *a)
|
||||
{
|
||||
if (a->index != 0)
|
||||
if (unlikely(a->index))
|
||||
return -EINVAL;
|
||||
|
||||
memset(a, 0, sizeof(*a));
|
||||
strcpy(a->name, "Radio");
|
||||
|
||||
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,
|
||||
struct v4l2_audio *a)
|
||||
{
|
||||
if (unlikely(a->index))
|
||||
return -EINVAL;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int radio_s_input(struct file *filp, void *priv, unsigned int i)
|
||||
{
|
||||
if (unlikely(i))
|
||||
return -EINVAL;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user