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

Commit 0a5ea88b authored by Ondrej Zary's avatar Ondrej Zary Committed by Mauro Carvalho Chehab
Browse files

[media] saa7134: v4l2-compliance: return real frequency 



Make saa7134 driver more V4L2 compliant: don't cache frequency in
s_frequency/g_frequency but return real one instead

Signed-off-by: default avatarOndrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 3bbaa3a6

drivers/media/pci/saa7134/saa7134-video.c

+4 −2
Original line number Diff line number Diff line
@@ -2051,8 +2051,11 @@ static int saa7134_g_frequency(struct file *file, void *priv, 
	struct saa7134_fh *fh = priv;

	struct saa7134_dev *dev = fh->dev;



	if (0 != f->tuner)

		return -EINVAL;



	f->type = fh->radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;

	f->frequency = dev->ctl_freq;

	saa_call_all(dev, tuner, g_frequency, f);



	return 0;

}
@@ -2070,7 +2073,6 @@ static int saa7134_s_frequency(struct file *file, void *priv, 
	if (1 == fh->radio && V4L2_TUNER_RADIO != f->type)

		return -EINVAL;

	mutex_lock(&dev->lock);

	dev->ctl_freq = f->frequency;



	saa_call_all(dev, tuner, s_frequency, f);

drivers/media/pci/saa7134/saa7134.h

+0 −1
Original line number Diff line number Diff line
@@ -607,7 +607,6 @@ struct saa7134_dev { 
	int                        ctl_contrast;

	int                        ctl_hue;

	int                        ctl_saturation;

	int                        ctl_freq;

	int                        ctl_mute;             /* audio */

	int                        ctl_volume;

	int                        ctl_invert;           /* private */