diff options
| author | Hans Verkuil | 2013-11-04 10:28:57 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2013-11-29 17:22:35 +0100 |
| commit | 9ba6a91f19b8c118d11c549495fa4f7a20505d80 (patch) | |
| tree | a2304ac3a0b7de5c3448af6d1e0902a6b09a331b /drivers/media | |
| parent | [media] cx231xx: use after free on error path in probe (diff) | |
| download | kernel-qcow2-linux-9ba6a91f19b8c118d11c549495fa4f7a20505d80.tar.gz kernel-qcow2-linux-9ba6a91f19b8c118d11c549495fa4f7a20505d80.tar.xz kernel-qcow2-linux-9ba6a91f19b8c118d11c549495fa4f7a20505d80.zip | |
[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: Hans Verkuil <hans.verkuil@cisco.com>
Reported-by: Hans Petter Selasky <hps@bitfrost.no>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Cc: stable@vger.kernel.org # for 3.11 and up
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/radio/radio-tea5764.c | 2 | ||||
| -rw-r--r-- | drivers/media/radio/tef6862.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c index 036e2f54f4db..3ed1f5669f79 100644 --- a/drivers/media/radio/radio-tea5764.c +++ b/drivers/media/radio/radio-tea5764.c @@ -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; diff --git a/drivers/media/radio/tef6862.c b/drivers/media/radio/tef6862.c index 69e3245a58a0..a9319a24c7ef 100644 --- a/drivers/media/radio/tef6862.c +++ b/drivers/media/radio/tef6862.c @@ -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; |