summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2014-03-10 14:28:45 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-03-14 05:39:58 -0300
commitea4d04f92c97c7986dfc363655f9c4143d35c2b9 (patch)
tree34c86225f718ce650c48a37d114256c4dfd0dcff
parentbc9087549ea9f57c400013d08d311c7cd4892132 (diff)
downloadlinux-ea4d04f92c97c7986dfc363655f9c4143d35c2b9.tar.gz
linux-ea4d04f92c97c7986dfc363655f9c4143d35c2b9.tar.bz2
linux-ea4d04f92c97c7986dfc363655f9c4143d35c2b9.zip
[media] rtl2832_sdr: clamp bandwidth to nearest legal value in automode
Clamp bandwidth to nearest legal value in automode in order to pass v4l2-compliance test. Reported-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.c b/drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.c
index 141fc8b428ba..b09f7d8c12cf 100644
--- a/drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.c
+++ b/drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.c
@@ -1322,8 +1322,16 @@ static int rtl2832_sdr_s_ctrl(struct v4l2_ctrl *ctrl)
switch (ctrl->id) {
case V4L2_CID_RF_TUNER_BANDWIDTH_AUTO:
case V4L2_CID_RF_TUNER_BANDWIDTH:
- if (s->bandwidth_auto->val)
- s->bandwidth->val = s->f_adc;
+ /* TODO: these controls should be moved to tuner drivers */
+ if (s->bandwidth_auto->val) {
+ /* Round towards the closest legal value */
+ s32 val = s->f_adc + s->bandwidth->step / 2;
+ u32 offset;
+ val = clamp(val, s->bandwidth->minimum, s->bandwidth->maximum);
+ offset = val - s->bandwidth->minimum;
+ offset = s->bandwidth->step * (offset / s->bandwidth->step);
+ s->bandwidth->val = s->bandwidth->minimum + offset;
+ }
c->bandwidth_hz = s->bandwidth->val;