Commit f74f89cb authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

[media] bttv: fix ENUM_INPUT and S_INPUT

- Fix ENUM_INPUT audioset.
- Fix incorrect input check in s_input.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1b9e94dc
...@@ -1923,7 +1923,7 @@ static int bttv_enum_input(struct file *file, void *priv, ...@@ -1923,7 +1923,7 @@ static int bttv_enum_input(struct file *file, void *priv,
} }
i->type = V4L2_INPUT_TYPE_CAMERA; i->type = V4L2_INPUT_TYPE_CAMERA;
i->audioset = 1; i->audioset = 0;
if (btv->tuner_type != TUNER_ABSENT && i->index == 0) { if (btv->tuner_type != TUNER_ABSENT && i->index == 0) {
sprintf(i->name, "Television"); sprintf(i->name, "Television");
...@@ -1964,21 +1964,16 @@ static int bttv_s_input(struct file *file, void *priv, unsigned int i) ...@@ -1964,21 +1964,16 @@ static int bttv_s_input(struct file *file, void *priv, unsigned int i)
{ {
struct bttv_fh *fh = priv; struct bttv_fh *fh = priv;
struct bttv *btv = fh->btv; struct bttv *btv = fh->btv;
int err; int err;
err = v4l2_prio_check(&btv->prio, fh->prio); err = v4l2_prio_check(&btv->prio, fh->prio);
if (unlikely(err)) if (err)
goto err; return err;
if (i > bttv_tvcards[btv->c.type].video_inputs) { if (i >= bttv_tvcards[btv->c.type].video_inputs)
err = -EINVAL; return -EINVAL;
goto err;
}
set_input(btv, i, btv->tvnorm); set_input(btv, i, btv->tvnorm);
err:
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment