[REVIEWv2 PATCH 03/19] bttv: fix ENUM_INPUT and S_INPUT

[Hans Verkuil]

From: Hans Verkuil <hans.verk...@cisco.com>

- Fix ENUM_INPUT audioset.
- Fix incorrect input check in s_input.

Signed-off-by: Hans Verkuil <hans.verk...@cisco.com>
---
 drivers/media/pci/bt8xx/bttv-driver.c |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/media/pci/bt8xx/bttv-driver.c 
b/drivers/media/pci/bt8xx/bttv-driver.c
index b36d675..6e61dbd 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -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;
 }
 
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html