[media] mb86a20s: Fix the code that estimates the measurement interval
authorMauro Carvalho Chehab <m.chehab@samsung.com>
Sat, 12 Jul 2014 00:37:48 +0000 (21:37 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Wed, 23 Jul 2014 00:34:03 +0000 (21:34 -0300)
Instead of looking at the guard interval field, it was using
the interval length, with is wrong. Fix it.

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/dvb-frontends/mb86a20s.c

index 83fac7886813b19a573b11c3e2899c16e5e7367a..b931179c70a48e767848f2fdc43e37ed2aaba5bf 100644 (file)
@@ -556,7 +556,7 @@ static u32 isdbt_rate[3][5][4] = {
 
 static void mb86a20s_layer_bitrate(struct dvb_frontend *fe, u32 layer,
                                   u32 modulation, u32 forward_error_correction,
-                                  u32 interleaving,
+                                  u32 guard_interval,
                                   u32 segment)
 {
        struct mb86a20s_state *state = fe->demodulator_priv;
@@ -564,7 +564,7 @@ static void mb86a20s_layer_bitrate(struct dvb_frontend *fe, u32 layer,
        int mod, fec, guard;
 
        /*
-        * If modulation/fec/interleaving is not detected, the default is
+        * If modulation/fec/guard is not detected, the default is
         * to consider the lowest bit rate, to avoid taking too long time
         * to get BER.
         */
@@ -602,7 +602,7 @@ static void mb86a20s_layer_bitrate(struct dvb_frontend *fe, u32 layer,
                break;
        }
 
-       switch (interleaving) {
+       switch (guard_interval) {
        default:
        case GUARD_INTERVAL_1_4:
                guard = 0;
@@ -693,7 +693,7 @@ static int mb86a20s_get_frontend(struct dvb_frontend *fe)
                c->layer[layer].interleaving = rc;
                mb86a20s_layer_bitrate(fe, layer, c->layer[layer].modulation,
                                       c->layer[layer].fec,
-                                      c->layer[layer].interleaving,
+                                      c->guard_interval,
                                       c->layer[layer].segment_count);
        }