V4L/DVB (11677): radio-fm16: fix g_tuner.

g_tuner handled capability, audmode and rxsubchans incorrectly.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index e598b5471d8a010cb95a8c62d96864a2e46be15e..49c4aab95daba17a6298a007af3ac502bb7a0282 100644 (file)
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -151,7 +151,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
        v->rangelow = RSF16_MINFREQ;
        v->rangehigh = RSF16_MAXFREQ;
        v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
-       v->capability = V4L2_TUNER_CAP_LOW;
+       v->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_LOW;
        v->audmode = V4L2_TUNER_MODE_STEREO;
        v->signal = fmi_getsigstr(fmi);
        return 0;

diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index 87e01c556d884d9603331398d62f0b8ee01026d9..a11414f648d4f9279431b98d103450d4c8926bfd 100644 (file)
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -230,10 +230,10 @@ static int vidioc_g_tuner(struct file *file, void *priv,
 
        v->rangelow = RSF16_MINFREQ;
        v->rangehigh = RSF16_MAXFREQ;
-       v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
-       v->capability = V4L2_TUNER_CAP_LOW;
-       v->audmode = fmr2->stereo ? V4L2_TUNER_MODE_STEREO:
-                               V4L2_TUNER_MODE_MONO;
+       v->rxsubchans = fmr2->stereo ? V4L2_TUNER_SUB_STEREO :
+                                       V4L2_TUNER_SUB_MONO;
+       v->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_LOW;
+       v->audmode = V4L2_TUNER_MODE_STEREO;
        mutex_lock(&fmr2->lock);
        v->signal = fmr2_getsigstr(fmr2);
        mutex_unlock(&fmr2->lock);