diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-12-20 14:53:50 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-12-31 05:26:50 -0500 |
commit | 35fea0649edcdbd75e3aeadd84d366f7e46a60ab (patch) | |
tree | 9b01ca879a6edd39c5304bc1fedc2ea8e04ac815 /drivers/media/common | |
parent | 01ce5a7915932c199c8196347d0469ab2cc0573f (diff) |
[media] mc44s803: use DVBv5 parameters on set_params()
Instead of using DVBv3 parameters, rely on DVBv5 parameters to
set the tuner.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common')
-rw-r--r-- | drivers/media/common/tuners/mc44s803.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/common/tuners/mc44s803.c b/drivers/media/common/tuners/mc44s803.c index fe5c4b8d83e..5a8758cad5e 100644 --- a/drivers/media/common/tuners/mc44s803.c +++ b/drivers/media/common/tuners/mc44s803.c | |||
@@ -218,18 +218,19 @@ static int mc44s803_set_params(struct dvb_frontend *fe, | |||
218 | struct dvb_frontend_parameters *params) | 218 | struct dvb_frontend_parameters *params) |
219 | { | 219 | { |
220 | struct mc44s803_priv *priv = fe->tuner_priv; | 220 | struct mc44s803_priv *priv = fe->tuner_priv; |
221 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | ||
221 | u32 r1, r2, n1, n2, lo1, lo2, freq, val; | 222 | u32 r1, r2, n1, n2, lo1, lo2, freq, val; |
222 | int err; | 223 | int err; |
223 | 224 | ||
224 | priv->frequency = params->frequency; | 225 | priv->frequency = c->frequency; |
225 | 226 | ||
226 | r1 = MC44S803_OSC / 1000000; | 227 | r1 = MC44S803_OSC / 1000000; |
227 | r2 = MC44S803_OSC / 100000; | 228 | r2 = MC44S803_OSC / 100000; |
228 | 229 | ||
229 | n1 = (params->frequency + MC44S803_IF1 + 500000) / 1000000; | 230 | n1 = (c->frequency + MC44S803_IF1 + 500000) / 1000000; |
230 | freq = MC44S803_OSC / r1 * n1; | 231 | freq = MC44S803_OSC / r1 * n1; |
231 | lo1 = ((60 * n1) + (r1 / 2)) / r1; | 232 | lo1 = ((60 * n1) + (r1 / 2)) / r1; |
232 | freq = freq - params->frequency; | 233 | freq = freq - c->frequency; |
233 | 234 | ||
234 | n2 = (freq - MC44S803_IF2 + 50000) / 100000; | 235 | n2 = (freq - MC44S803_IF2 + 50000) / 100000; |
235 | lo2 = ((60 * n2) + (r2 / 2)) / r2; | 236 | lo2 = ((60 * n2) + (r2 / 2)) / r2; |