Skip to content

Commit

Permalink
V4L/DVB (7462): bttv: Fix some API non-compliances for some audio/inp…
Browse files Browse the repository at this point in the history
…ut V4L2 calls

Thanks to Cyrill Gorcunov <gorcunov@gmail.com> for pointing this
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Mauro Carvalho Chehab committed Apr 24, 2008
1 parent 7bf9746 commit d69b2e4
Showing 1 changed file with 14 additions and 3 deletions.
17 changes: 14 additions & 3 deletions drivers/media/video/bt8xx/bttv-driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -3510,18 +3516,17 @@ 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;
}

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;
Expand All @@ -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;
}

Expand Down

0 comments on commit d69b2e4

Please sign in to comment.