[media] dvb: replace SYS_DVBC_ANNEX_AC by the right delsys

SYS_DVBC_ANNEX_AC is an alias for SYS_DVBC_ANNEX_A. However,
the first one is incorrect, as not all devices support both.
So, replace its occurrences by the proper value (either
SYS_DVBC_ANNEX_A or both SYS_DVBC_ANNEX_A and SYS_DVBC_ANNEX_C).

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/common/tuners/tda18212.c b/drivers/media/common/tuners/tda18212.c
index f52282e..a58c74f 100644 (file)
--- a/drivers/media/common/tuners/tda18212.c
+++ b/drivers/media/common/tuners/tda18212.c
@@ -203,7 +203,8 @@ static int tda18212_set_params(struct dvb_frontend *fe,
                        goto error;
                }
                break;
-       case SYS_DVBC_ANNEX_AC:
+       case SYS_DVBC_ANNEX_A:
+       case SYS_DVBC_ANNEX_C:
                if_khz = priv->cfg->if_dvbc;
                i = DVBC_8;
                break;

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 3ff37cf..2e4bdde 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -1242,7 +1242,7 @@ static void dtv_set_default_delivery_caps(const struct dvb_frontend *fe, struct
                        p->u.buffer.data[ncaps++] = SYS_TURBO;
                break;
        case FE_QAM:
-               p->u.buffer.data[ncaps++] = SYS_DVBC_ANNEX_AC;
+               p->u.buffer.data[ncaps++] = SYS_DVBC_ANNEX_A;
                break;
        case FE_OFDM:
                p->u.buffer.data[ncaps++] = SYS_DVBT;

diff --git a/drivers/media/dvb/frontends/cxd2820r_c.c b/drivers/media/dvb/frontends/cxd2820r_c.c
index 9847d35..bc13db4 100644 (file)
--- a/drivers/media/dvb/frontends/cxd2820r_c.c
+++ b/drivers/media/dvb/frontends/cxd2820r_c.c
@@ -59,7 +59,7 @@ int cxd2820r_set_frontend_c(struct dvb_frontend *fe,
        if (fe->ops.tuner_ops.set_params)
                fe->ops.tuner_ops.set_params(fe, params);
 
-       if (priv->delivery_system !=  SYS_DVBC_ANNEX_AC) {
+       if (priv->delivery_system !=  SYS_DVBC_ANNEX_A) {
                for (i = 0; i < ARRAY_SIZE(tab); i++) {
                        ret = cxd2820r_wr_reg_mask(priv, tab[i].reg,
                                tab[i].val, tab[i].mask);
@@ -68,7 +68,7 @@ int cxd2820r_set_frontend_c(struct dvb_frontend *fe,
                }
        }
 
-       priv->delivery_system = SYS_DVBC_ANNEX_AC;
+       priv->delivery_system = SYS_DVBC_ANNEX_A;
        priv->ber_running = 0; /* tune stops BER counter */
 
        /* program IF frequency */