Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-02 09:01:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] dvb: replace SYS_DVBC_ANNEX_AC by the right delsys

Browse Source 
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>
This commit is contained in:
Mauro Carvalho Chehab 2011-12-22 18:11:39 -03:00
parent 7b0962d323
commit 0349471bc5
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/common/tuners/tda18212.c
View File

@ -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;

2
drivers/media/dvb/dvb-core/dvb_frontend.c
View File

@ -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;

4
drivers/media/dvb/frontends/cxd2820r_c.c
View File

@ -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 */