summaryrefslogtreecommitdiff
path: root/linux/drivers/media/common/tuners
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-13 18:06:14 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-13 18:06:14 -0300
commit9840199e825a71000f4d87e61380867fe3dc7f80 (patch)
treeaaee9b6e6b95130e5409343389d9f65dd9867094 /linux/drivers/media/common/tuners
parentf689c3bd615386cf4c5238d1b4de1aaf4b58ce69 (diff)
parentc3ce9d2f22c72aa484146a24d87be98d1a29ab9f (diff)
downloadmediapointer-dvb-s2-9840199e825a71000f4d87e61380867fe3dc7f80.tar.gz
mediapointer-dvb-s2-9840199e825a71000f4d87e61380867fe3dc7f80.tar.bz2
merge: http://linuxtv.org/hg/~hgoede/libv4l
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/common/tuners')
-rw-r--r--linux/drivers/media/common/tuners/xc5000.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/linux/drivers/media/common/tuners/xc5000.c b/linux/drivers/media/common/tuners/xc5000.c
index 36c81febb..b0e20bc20 100644
--- a/linux/drivers/media/common/tuners/xc5000.c
+++ b/linux/drivers/media/common/tuners/xc5000.c
@@ -758,7 +758,10 @@ static int xc5000_set_analog_params(struct dvb_frontend *fe,
dprintk(1, "%s() frequency=%d (in units of 62.5khz)\n",
__func__, params->frequency);
- priv->rf_mode = XC_RF_MODE_CABLE; /* Fix me: it could be air. */
+ /* Fix me: it could be air. */
+ priv->rf_mode = params->mode;
+ if (params->mode > XC_RF_MODE_CABLE)
+ priv->rf_mode = XC_RF_MODE_CABLE;
/* params->frequency is in units of 62.5khz */
priv->freq_hz = params->frequency * 62500;