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

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

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



g_tuner handled capability, audmode and rxsubchans incorrectly.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1d80db56

drivers/media/radio/radio-sf16fmi.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/media/radio/radio-sf16fmr2.c

+4 −4
Original line number Diff line number Diff line
@@ -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);