diff options
Diffstat (limited to 'drivers/media/tuners/mxl5005s.c')
| -rw-r--r-- | drivers/media/tuners/mxl5005s.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/drivers/media/tuners/mxl5005s.c b/drivers/media/tuners/mxl5005s.c index ab4c43df9d18..0e811c5eae6c 100644 --- a/drivers/media/tuners/mxl5005s.c +++ b/drivers/media/tuners/mxl5005s.c @@ -2639,7 +2639,7 @@ static u16 MXL_TuneRF(struct dvb_frontend *fe, u32 RF_Freq) E5A = (((Fmax - state->RF_LO)/1000)*4/((Fmax-Fmin)/1000)) + 1 ; status += MXL_ControlWrite(fe, RFSYN_LPF_R, E5A); - /* Euqation E5B CHCAL_EN_INIT_RF */ + /* Equation E5B CHCAL_EN_INIT_RF */ status += MXL_ControlWrite(fe, CHCAL_EN_INT_RF, ((E5 == 0) ? 1 : 0)); /*if (E5 == 0) * status += MXL_ControlWrite(fe, CHCAL_EN_INT_RF, 1); @@ -3423,9 +3423,11 @@ static u16 MXL_ControlWrite_Group(struct dvb_frontend *fe, u16 controlNum, if (controlNum == state->Init_Ctrl[i].Ctrl_Num) { - highLimit = 1 << state->Init_Ctrl[i].size; + u16 size = min_t(u16, state->Init_Ctrl[i].size, + ARRAY_SIZE(state->Init_Ctrl[i].val)); + highLimit = 1 << size; if (value < highLimit) { - for (j = 0; j < state->Init_Ctrl[i].size; j++) { + for (j = 0; j < size; j++) { state->Init_Ctrl[i].val[j] = (u8)((value >> j) & 0x01); MXL_RegWriteBit(fe, (u8)(state->Init_Ctrl[i].addr[j]), (u8)(state->Init_Ctrl[i].bit[j]), @@ -3442,9 +3444,11 @@ static u16 MXL_ControlWrite_Group(struct dvb_frontend *fe, u16 controlNum, if (controlNum == state->CH_Ctrl[i].Ctrl_Num) { - highLimit = 1 << state->CH_Ctrl[i].size; + u16 size = min_t(u16, state->CH_Ctrl[i].size, + ARRAY_SIZE(state->CH_Ctrl[i].val)); + highLimit = 1 << size; if (value < highLimit) { - for (j = 0; j < state->CH_Ctrl[i].size; j++) { + for (j = 0; j < size; j++) { state->CH_Ctrl[i].val[j] = (u8)((value >> j) & 0x01); MXL_RegWriteBit(fe, (u8)(state->CH_Ctrl[i].addr[j]), (u8)(state->CH_Ctrl[i].bit[j]), @@ -3637,7 +3641,7 @@ static u16 MXL_GetCHRegister_ZeroIF(struct dvb_frontend *fe, u8 *RegNum, u16 status = 0; int i; - u8 RegAddr[] = {43, 136}; + static const u8 RegAddr[] = {43, 136}; *count = ARRAY_SIZE(RegAddr); @@ -4116,7 +4120,7 @@ struct dvb_frontend *mxl5005s_attach(struct dvb_frontend *fe, fe->tuner_priv = state; return fe; } -EXPORT_SYMBOL(mxl5005s_attach); +EXPORT_SYMBOL_GPL(mxl5005s_attach); MODULE_DESCRIPTION("MaxLinear MXL5005S silicon tuner driver"); MODULE_AUTHOR("Steven Toth"); |