---

yaml --- r: 285340 b: refs/heads/master c: 78bd3dc h: refs/heads/master v: v3
git-mirror · Dec 8, 2011 · cdfaf4a · cdfaf4a
1 parent f88fdbc
commit cdfaf4a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bf936290baff2507763a2540cd9029e70ae39e2
+refs/heads/master: 78bd3dc8dafc48f11fb761bc01b16e045638fec8
diff --git a/trunk/drivers/media/common/tuners/xc5000.c b/trunk/drivers/media/common/tuners/xc5000.c
@@ -708,9 +708,9 @@ static int xc5000_set_params(struct dvb_frontend *fe,
 			 * is equal to 0.15 for Annex A, and 0.13 for annex C
 			 */
 			if (fe->dtv_property_cache.rolloff == ROLLOFF_13)
-				bw = (params->u.qam.symbol_rate * 13) / 10;
+				bw = (params->u.qam.symbol_rate * 113) / 100;
 			else
-				bw = (params->u.qam.symbol_rate * 15) / 10;
+				bw = (params->u.qam.symbol_rate * 115) / 100;
 			if (bw <= 6000000) {
 				priv->bandwidth = BANDWIDTH_6_MHZ;
 				priv->video_standard = DTV6;
@@ -720,6 +720,8 @@ static int xc5000_set_params(struct dvb_frontend *fe,
 				priv->video_standard = DTV7_8;
 				priv->freq_hz = params->frequency - 2750000;
 			}
+			dprintk(1, "%s() Bandwidth %dMHz (%d)\n", __func__,
+				BANDWIDTH_6_MHZ ? 6: 8, bw);
 			break;
 		default:
 			dprintk(1, "%s() Unsupported QAM type\n", __func__);

diff --git a/trunk/drivers/media/dvb/frontends/tda18271c2dd.c b/trunk/drivers/media/dvb/frontends/tda18271c2dd.c
@@ -1158,9 +1158,9 @@ static int set_params(struct dvb_frontend *fe,
 		 * is equal to 0.15 for Annex A, and 0.13 for annex C
 		 */
 		if (fe->dtv_property_cache.rolloff == ROLLOFF_13)
-			bw = (params->u.qam.symbol_rate * 13) / 10;
+			bw = (params->u.qam.symbol_rate * 113) / 100;
 		else
-			bw = (params->u.qam.symbol_rate * 15) / 10;
+			bw = (params->u.qam.symbol_rate * 115) / 100;
 		if (bw <= 6000000)
 			Standard = HF_DVBC_6MHZ;
 		else if (bw <= 7000000)