Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

drivers/media/pci/bt8xx/bttv-driver.c

+5 −10
Original line number Diff line number Diff line
@@ -1923,7 +1923,7 @@ static int bttv_enum_input(struct file *file, void *priv, 
	}



	i->type     = V4L2_INPUT_TYPE_CAMERA;

	i->audioset = 1;

	i->audioset = 0;



	if (btv->tuner_type != TUNER_ABSENT && i->index == 0) {

		sprintf(i->name, "Television");
@@ -1964,21 +1964,16 @@ static int bttv_s_input(struct file *file, void *priv, unsigned int i) 
{

	struct bttv_fh *fh  = priv;

	struct bttv *btv = fh->btv;



	int err;



	err = v4l2_prio_check(&btv->prio, fh->prio);

	if (unlikely(err))

		goto err;

	if (err)

		return err;



	if (i > bttv_tvcards[btv->c.type].video_inputs) {

		err = -EINVAL;

		goto err;

	}

	if (i >= bttv_tvcards[btv->c.type].video_inputs)

		return -EINVAL;



	set_input(btv, i, btv->tvnorm);



err:

	return 0;

}