]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
[media] cxd2841er: fix switch-case for DVB-C
authorAbylay Ospan <aospan@netup.ru>
Fri, 15 Jul 2016 17:59:37 +0000 (14:59 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Sat, 16 Jul 2016 09:58:59 +0000 (06:58 -0300)
DVB-C should use cxd2841er_read_agc_gain_c() to get the gain. The same
function is used for all DVB-C annex delivery systems.

Signed-off-by: Abylay Ospan <aospan@netup.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/dvb-frontends/cxd2841er.c

index 2476d356069c7c480fe915276b67558d9167ef90..b2bfbaab28cd21e54025d38120c60682339d0a49 100644 (file)
@@ -1750,13 +1750,6 @@ static void cxd2841er_read_signal_strength(struct dvb_frontend *fe)
 
        dev_dbg(&priv->i2c->dev, "%s()\n", __func__);
        switch (p->delivery_system) {
-       case SYS_DVBC_ANNEX_B:
-       case SYS_DVBC_ANNEX_C:
-               strength = 65535 - cxd2841er_read_agc_gain_c(
-                               priv, p->delivery_system);
-               p->strength.stat[0].scale = FE_SCALE_RELATIVE;
-               p->strength.stat[0].uvalue = strength;
-               break;
        case SYS_DVBT:
        case SYS_DVBT2:
                strength = cxd2841er_read_agc_gain_t_t2(priv,
@@ -1766,7 +1759,9 @@ static void cxd2841er_read_signal_strength(struct dvb_frontend *fe)
                p->strength.stat[0].uvalue = strength * 366 / 100 - 89520;
                break;  /* Code moved out of the function */
        case SYS_DVBC_ANNEX_A:
-               strength = cxd2841er_read_agc_gain_t_t2(priv,
+       case SYS_DVBC_ANNEX_B:
+       case SYS_DVBC_ANNEX_C:
+               strength = cxd2841er_read_agc_gain_c(priv,
                                                        p->delivery_system);
                p->strength.stat[0].scale = FE_SCALE_DECIBEL;
                /*