media: bttv: use audio defaults for winfast2000

The winfast2000 card advertised rxsubchans that weren't compatible with
its default audmode. Just use the default audmode (V4L2_TUNER_MODE_MONO)
and default audio reception flag (V4L2_TUNER_SUB_MONO) for this card.
Fixes compliance test failures.

Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/pci/bt8xx/bttv-audio-hook.c b/drivers/media/pci/bt8xx/bttv-audio-hook.c
index da1914a20b819a7eff4914c20ab2a5fd62da766f..b5d071835354a7cd1d19e9de6dfaf154150752a1 100644 (file)
--- a/drivers/media/pci/bt8xx/bttv-audio-hook.c
+++ b/drivers/media/pci/bt8xx/bttv-audio-hook.c
@@ -293,16 +293,8 @@ void winfast2000_audio(struct bttv *btv, struct v4l2_tuner *t, int set)
 {
        unsigned long val;
 
-       if (!set) {
-               /* Not much to do here */
-               t->audmode = V4L2_TUNER_MODE_LANG1;
-               t->rxsubchans = V4L2_TUNER_SUB_MONO |
-                               V4L2_TUNER_SUB_STEREO |
-                               V4L2_TUNER_SUB_LANG1 |
-                               V4L2_TUNER_SUB_LANG2;
-
+       if (!set)
                return;
-       }
 
        /*btor (0xc32000, BT848_GPIO_OUT_EN);*/
        switch (t->audmode) {