diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-11 12:02:55 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-11 12:02:55 -0300 |
| commit | 7540c1624e2e91cd608d60f7ceb6003df747152e (patch) | |
| tree | 688db69a58fb13a083e1893fa0f9e0c9da2c20c5 /linux/drivers/media/dvb/frontends | |
| parent | 1537b0475bd1f694226d14373ed31298f2d0e8ef (diff) | |
| parent | 1739deb9fa270e49dbcaa25a95796b4927cc4a78 (diff) | |
| download | mediapointer-dvb-s2-7540c1624e2e91cd608d60f7ceb6003df747152e.tar.gz mediapointer-dvb-s2-7540c1624e2e91cd608d60f7ceb6003df747152e.tar.bz2 | |
merge: http://linuxtv.org/hg/~dougsland/empire/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/frontends')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/cx24113.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/frontends/cx24113.c b/linux/drivers/media/dvb/frontends/cx24113.c index e4fd533a4..075b2b57c 100644 --- a/linux/drivers/media/dvb/frontends/cx24113.c +++ b/linux/drivers/media/dvb/frontends/cx24113.c @@ -303,6 +303,7 @@ static void cx24113_calc_pll_nf(struct cx24113_state *state, u16 *n, s32 *f) { s32 N; s64 F; + u64 dividend; u8 R, r; u8 vcodiv; u8 factor; @@ -346,7 +347,10 @@ static void cx24113_calc_pll_nf(struct cx24113_state *state, u16 *n, s32 *f) F = freq_hz; F *= (u64) (R * vcodiv * 262144); dprintk("1 N: %d, F: %lld, R: %d\n", N, (long long)F, R); - do_div(F, state->config->xtal_khz*1000 * factor * 2); + /* do_div needs an u64 as first argument */ + dividend = F; + do_div(dividend, state->config->xtal_khz * 1000 * factor * 2); + F = dividend; dprintk("2 N: %d, F: %lld, R: %d\n", N, (long long)F, R); F -= (N + 32) * 262144; |