Skip to content

Commit

Permalink
V4L/DVB (13360): stv090x: fix the calculation of the r divider in stv…
Browse files Browse the repository at this point in the history
…6110x_set_frequency

It had always the value 3 no matter what frequency was given.

Signed-off-by: Andreas Regel <andreas.regel@gmx.de>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Andreas Regel authored and Mauro Carvalho Chehab committed Dec 5, 2009
1 parent 7b035da commit 7c236e3
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/media/dvb/frontends/stv6110x.c
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ static int stv6110x_set_frequency(struct dvb_frontend *fe, u32 frequency)
{
struct stv6110x_state *stv6110x = fe->tuner_priv;
u32 rDiv, divider;
s32 pVal, pCalc, rDivOpt = 0;
s32 pVal, pCalc, rDivOpt = 0, pCalcOpt = 1000;
u8 i;

STV6110x_SETFIELD(stv6110x_regs[STV6110x_CTRL1], CTRL1_K, (REFCLOCK_MHz - 16));
Expand All @@ -121,8 +121,10 @@ static int stv6110x_set_frequency(struct dvb_frontend *fe, u32 frequency)
for (rDiv = 0; rDiv <= 3; rDiv++) {
pCalc = (REFCLOCK_kHz / 100) / R_DIV(rDiv);

if ((abs((s32)(pCalc - pVal))) < (abs((s32)(1000 - pVal))))
if ((abs((s32)(pCalc - pVal))) < (abs((s32)(pCalcOpt - pVal))))
rDivOpt = rDiv;

pCalcOpt = (REFCLOCK_kHz / 100) / R_DIV(rDivOpt);
}

divider = (frequency * R_DIV(rDivOpt) * pVal) / REFCLOCK_kHz;
Expand Down

0 comments on commit 7c236e3

Please sign in to comment.