[media] zl10036: use DVBv5 parameters on set_params()
authorMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 23 Dec 2011 09:56:47 +0000 (06:56 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 31 Dec 2011 10:42:48 +0000 (08:42 -0200)
Instead of using DVBv3 parameters, rely on DVBv5 parameters to
set the tuner

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/frontends/zl10036.c

index 81aa984c551f3516b7179aaab4624d4039252df9..129d0f2a87e42d5afe2f0f0358e89c0b34ec580c 100644 (file)
@@ -308,9 +308,10 @@ static int zl10036_set_gain_params(struct zl10036_state *state,
 static int zl10036_set_params(struct dvb_frontend *fe,
                struct dvb_frontend_parameters *params)
 {
+       struct dtv_frontend_properties *p = &fe->dtv_property_cache;
        struct zl10036_state *state = fe->tuner_priv;
        int ret = 0;
-       u32 frequency = params->frequency;
+       u32 frequency = p->frequency;
        u32 fbw;
        int i;
        u8 c;
@@ -326,7 +327,7 @@ static int zl10036_set_params(struct dvb_frontend *fe,
         * fBW = (alpha*symbolrate)/(2*0.8)
         * 1.35 / (2*0.8) = 27 / 32
         */
-       fbw = (27 * params->u.qpsk.symbol_rate) / 32;
+       fbw = (27 * p->symbol_rate) / 32;
 
        /* scale to kHz */
        fbw /= 1000;
@@ -353,7 +354,7 @@ static int zl10036_set_params(struct dvb_frontend *fe,
        if (ret < 0)
                goto error;
 
-       ret = zl10036_set_frequency(state, params->frequency);
+       ret = zl10036_set_frequency(state, p->frequency);
        if (ret < 0)
                goto error;