From f8ad8875719d67eaa72cfe29196089c07c12644b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20B=C3=BCsch?= Date: Thu, 7 Feb 2013 12:16:55 -0300 Subject: [PATCH] --- yaml --- r: 357547 b: refs/heads/master c: 03a497d4b4c5205f6a365c4673e21298e681a8a6 h: refs/heads/master i: 357545: 03da7344078eb1d34ba6624fd9ae31e61835cd6b 357543: d4a560c8b07bf56a3335aecd48ee5b97c99f8bdb v: v3 --- [refs] | 2 +- trunk/drivers/media/tuners/fc0011.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index a8bdee22a4ee..9322ccdc1c1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db5c05b2a1c02e401778de348451bae49b65806e +refs/heads/master: 03a497d4b4c5205f6a365c4673e21298e681a8a6 diff --git a/trunk/drivers/media/tuners/fc0011.c b/trunk/drivers/media/tuners/fc0011.c index 3089f2ebcbfe..f87aa5a8b8ea 100644 --- a/trunk/drivers/media/tuners/fc0011.c +++ b/trunk/drivers/media/tuners/fc0011.c @@ -183,8 +183,7 @@ static int fc0011_set_params(struct dvb_frontend *fe) unsigned int i, vco_retries; u32 freq = p->frequency / 1000; u32 bandwidth = p->bandwidth_hz / 1000; - u32 fvco, xin, xdiv, xdivr; - u16 frac; + u32 fvco, xin, frac, xdiv, xdivr; u8 fa, fp, vco_sel, vco_cal; u8 regs[FC11_NR_REGS] = { }; @@ -227,12 +226,8 @@ static int fc0011_set_params(struct dvb_frontend *fe) frac += 32786; if (!frac) xin = 0; - else if (frac < 511) - xin = 512; - else if (frac < 65026) - xin = frac; else - xin = 65024; + xin = clamp_t(u32, frac, 512, 65024); regs[FC11_REG_XINHI] = xin >> 8; regs[FC11_REG_XINLO] = xin;