1 files changed, 21 insertions, 13 deletions

diff --git a/drivers/media/common/tuners/tda18218.c b/drivers/media/common/tuners/tda18218.c
index 4fc29730a12c..dfb3a831df45 100644
--- a/drivers/media/common/tuners/tda18218.c
+++ b/drivers/media/common/tuners/tda18218.c
@@ -109,10 +109,11 @@ static int tda18218_rd_reg(struct tda18218_priv *priv, u8 reg, u8 *val)
         return tda18218_rd_regs(priv, reg, val, 1);
 }
 
-static int tda18218_set_params(struct dvb_frontend *fe,
-        struct dvb_frontend_parameters *params)
+static int tda18218_set_params(struct dvb_frontend *fe)
 {
         struct tda18218_priv *priv = fe->tuner_priv;
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
+        u32 bw = c->bandwidth_hz;
         int ret;
         u8 buf[3], i, BP_Filter, LP_Fc;
         u32 LO_Frac;
@@ -138,22 +139,19 @@ static int tda18218_set_params(struct dvb_frontend *fe,
                 fe->ops.i2c_gate_ctrl(fe, 1); /* open I2C-gate */
 
         /* low-pass filter cut-off frequency */
-        switch (params->u.ofdm.bandwidth) {
-        case BANDWIDTH_6_MHZ:
+        if (bw <= 6000000) {
                 LP_Fc = 0;
-                LO_Frac = params->frequency + 3000000;
-                break;
-        case BANDWIDTH_7_MHZ:
+                priv->if_frequency = 3000000;
+        } else if (bw <= 7000000) {
                 LP_Fc = 1;
-                LO_Frac = params->frequency + 3500000;
-                break;
-        case BANDWIDTH_8_MHZ:
-        default:
+                priv->if_frequency = 3500000;
+        } else {
                 LP_Fc = 2;
-                LO_Frac = params->frequency + 4000000;
-                break;
+                priv->if_frequency = 4000000;
         }
 
+        LO_Frac = c->frequency + priv->if_frequency;
+
         /* band-pass filter */
         if (LO_Frac < 188000000)
                 BP_Filter = 3;
@@ -206,6 +204,14 @@ error:
         return ret;
 }
 
+static int tda18218_get_if_frequency(struct dvb_frontend *fe, u32 *frequency)
+{
+        struct tda18218_priv *priv = fe->tuner_priv;
+        *frequency = priv->if_frequency;
+        dbg("%s: if=%d", __func__, *frequency);
+        return 0;
+}
+
 static int tda18218_sleep(struct dvb_frontend *fe)
 {
         struct tda18218_priv *priv = fe->tuner_priv;
@@ -268,6 +274,8 @@ static const struct dvb_tuner_ops tda18218_tuner_ops = {
         .sleep         = tda18218_sleep,
 
         .set_params    = tda18218_set_params,
+
+        .get_if_frequency = tda18218_get_if_frequency,
 };
 
 struct dvb_frontend *tda18218_attach(struct dvb_frontend *fe,