|
@@ -1087,7 +1087,7 @@ u8 stv0900_get_optim_carr_loop(s32 srate, enum fe_stv0900_modcode modcode,
|
|
|
s32 pilot, u8 chip_id)
|
|
|
{
|
|
|
u8 aclc_value = 0x29;
|
|
|
- s32 i;
|
|
|
+ s32 i, cllas2_size;
|
|
|
const struct stv0900_car_loop_optim *cls2, *cllqs2, *cllas2;
|
|
|
|
|
|
dprintk("%s\n", __func__);
|
|
@@ -1096,14 +1096,17 @@ u8 stv0900_get_optim_carr_loop(s32 srate, enum fe_stv0900_modcode modcode,
|
|
|
cls2 = FE_STV0900_S2CarLoop;
|
|
|
cllqs2 = FE_STV0900_S2LowQPCarLoopCut30;
|
|
|
cllas2 = FE_STV0900_S2APSKCarLoopCut30;
|
|
|
+ cllas2_size = ARRAY_SIZE(FE_STV0900_S2APSKCarLoopCut30);
|
|
|
} else if (chip_id == 0x20) {
|
|
|
cls2 = FE_STV0900_S2CarLoopCut20;
|
|
|
cllqs2 = FE_STV0900_S2LowQPCarLoopCut20;
|
|
|
cllas2 = FE_STV0900_S2APSKCarLoopCut20;
|
|
|
+ cllas2_size = ARRAY_SIZE(FE_STV0900_S2APSKCarLoopCut20);
|
|
|
} else {
|
|
|
cls2 = FE_STV0900_S2CarLoopCut30;
|
|
|
cllqs2 = FE_STV0900_S2LowQPCarLoopCut30;
|
|
|
cllas2 = FE_STV0900_S2APSKCarLoopCut30;
|
|
|
+ cllas2_size = ARRAY_SIZE(FE_STV0900_S2APSKCarLoopCut30);
|
|
|
}
|
|
|
|
|
|
if (modcode < STV0900_QPSK_12) {
|
|
@@ -1178,7 +1181,7 @@ u8 stv0900_get_optim_carr_loop(s32 srate, enum fe_stv0900_modcode modcode,
|
|
|
aclc_value = cls2[i].car_loop_pilots_off_30;
|
|
|
}
|
|
|
|
|
|
- } else {
|
|
|
+ } else if (i < cllas2_size) {
|
|
|
if (srate <= 3000000)
|
|
|
aclc_value = cllas2[i].car_loop_pilots_on_2;
|
|
|
else if (srate <= 7000000)
|