---

yaml --- r: 357547 b: refs/heads/master c: 03a497d h: refs/heads/master i: 357545: 03da734 357543: d4a560c v: v3
git-mirror · Feb 8, 2013 · f8ad887 · f8ad887
1 parent cbebddf
commit f8ad887
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git 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
@@ -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;