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

Commit 9ba6a91f authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] tef6862/radio-tea5764: actually assign clamp result 



When adding frequency clamping to the tef6862 and radio-tea5764 drivers
I forgot to actually *assign* the clamp result to the frequency.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reported-by: default avatarHans Petter Selasky <hps@bitfrost.no>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
Cc: stable@vger.kernel.org # for 3.11 and up
parent 7e4b9187

drivers/media/radio/radio-tea5764.c

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static int vidioc_s_frequency(struct file *file, void *priv, 
		   So we keep it as-is. */

		return -EINVAL;

	}

	clamp(freq, FREQ_MIN * FREQ_MUL, FREQ_MAX * FREQ_MUL);

	freq = clamp(freq, FREQ_MIN * FREQ_MUL, FREQ_MAX * FREQ_MUL);

	tea5764_power_up(radio);

	tea5764_tune(radio, (freq * 125) / 2);

	return 0;

drivers/media/radio/tef6862.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static int tef6862_s_frequency(struct v4l2_subdev *sd, const struct v4l2_frequen 
	if (f->tuner != 0)

		return -EINVAL;



	clamp(freq, TEF6862_LO_FREQ, TEF6862_HI_FREQ);

	freq = clamp(freq, TEF6862_LO_FREQ, TEF6862_HI_FREQ);

	pll = 1964 + ((freq - TEF6862_LO_FREQ) * 20) / FREQ_MUL;

	i2cmsg[0] = (MSA_MODE_PRESET << MSA_MODE_SHIFT) | WM_SUB_PLLM;

	i2cmsg[1] = (pll >> 8) & 0xff;