From 355e08eb2b2ba5f809df12ea0315699c0bd009e8 Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Mon, 2 Oct 2006 21:35:40 -0300 Subject: [PATCH] --- yaml --- r: 38275 b: refs/heads/master c: 9b5a4a676a4d6126664c3df5a11f6fe87da63133 h: refs/heads/master i: 38273: 0fba254efcce7b7cd3c9a218ed1b0c3114f114c3 38271: 5d9bfea1220e7f6b13fb6959b93dc3c2d6d47186 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/cx24123.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 853bf758d0c0..71a2ddc2fbf9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2be893616c45e4ea4403d1ba501b7ee2f32b0ec +refs/heads/master: 9b5a4a676a4d6126664c3df5a11f6fe87da63133 diff --git a/trunk/drivers/media/dvb/frontends/cx24123.c b/trunk/drivers/media/dvb/frontends/cx24123.c index 62d69a6ea699..a356d28fc3bb 100644 --- a/trunk/drivers/media/dvb/frontends/cx24123.c +++ b/trunk/drivers/media/dvb/frontends/cx24123.c @@ -553,8 +553,8 @@ static int cx24123_pll_calculate(struct dvb_frontend* fe, struct dvb_frontend_pa ndiv = ( ((p->frequency * vco_div * 10) / (2 * XTAL / 1000)) / 32) & 0x1ff; adiv = ( ((p->frequency * vco_div * 10) / (2 * XTAL / 1000)) % 32) & 0x1f; - if (adiv == 0) - ndiv++; + if (adiv == 0 && ndiv > 0) + ndiv--; /* control bits 11, refdiv 11, charge pump polarity 1, charge pump current, ndiv, adiv */ state->pllarg = (3 << 19) | (3 << 17) | (1 << 16) | (pump << 14) | (ndiv << 5) | adiv;