From 86620fc41bd9232492c6e7a85eacf357cb28b10c Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 20 Dec 2011 16:53:50 -0300 Subject: [PATCH] --- yaml --- r: 285455 b: refs/heads/master c: 35fea0649edcdbd75e3aeadd84d366f7e46a60ab h: refs/heads/master i: 285453: 929ce8e42b5432782c4a00fd1aa20b3ffc340cc8 285451: 66af38ea0e4231b0ecfe660fd80f22ba72d99dfe 285447: 540b30a4ea496b4534285ca31d4027ff3892c2e1 285439: 3f73f14a5337acf107275770d7cb6b32ea9d79e5 v: v3 --- [refs] | 2 +- trunk/drivers/media/common/tuners/mc44s803.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3b8bac2b6f21..2143a68e3f16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01ce5a7915932c199c8196347d0469ab2cc0573f +refs/heads/master: 35fea0649edcdbd75e3aeadd84d366f7e46a60ab diff --git a/trunk/drivers/media/common/tuners/mc44s803.c b/trunk/drivers/media/common/tuners/mc44s803.c index fe5c4b8d83ee..5a8758cad5e9 100644 --- a/trunk/drivers/media/common/tuners/mc44s803.c +++ b/trunk/drivers/media/common/tuners/mc44s803.c @@ -218,18 +218,19 @@ static int mc44s803_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) { struct mc44s803_priv *priv = fe->tuner_priv; + struct dtv_frontend_properties *c = &fe->dtv_property_cache; u32 r1, r2, n1, n2, lo1, lo2, freq, val; int err; - priv->frequency = params->frequency; + priv->frequency = c->frequency; r1 = MC44S803_OSC / 1000000; r2 = MC44S803_OSC / 100000; - n1 = (params->frequency + MC44S803_IF1 + 500000) / 1000000; + n1 = (c->frequency + MC44S803_IF1 + 500000) / 1000000; freq = MC44S803_OSC / r1 * n1; lo1 = ((60 * n1) + (r1 / 2)) / r1; - freq = freq - params->frequency; + freq = freq - c->frequency; n2 = (freq - MC44S803_IF2 + 50000) / 100000; lo2 = ((60 * n2) + (r2 / 2)) / r2;