From 78bd3dc8dafc48f11fb761bc01b16e045638fec8 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 8 Dec 2011 12:58:22 -0200 Subject: [PATCH] [media] xc5000,tda18271c2dd: Fix bandwidth calculus While here, add a debug message, to easy detecting bugs on it. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/common/tuners/xc5000.c | 6 ++++-- drivers/media/dvb/frontends/tda18271c2dd.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c index ecd1f95726e2..19990bcbf5b2 100644 --- a/drivers/media/common/tuners/xc5000.c +++ b/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/drivers/media/dvb/frontends/tda18271c2dd.c b/drivers/media/dvb/frontends/tda18271c2dd.c index de544f6a4d70..b66ca29704fc 100644 --- a/drivers/media/dvb/frontends/tda18271c2dd.c +++ b/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)