aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/dvb/frontends/stb0899_algo.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/dvb/frontends/stb0899_algo.c b/drivers/media/dvb/frontends/stb0899_algo.c
index 914a82544c71..5b55b0dea7e4 100644
--- a/drivers/media/dvb/frontends/stb0899_algo.c
+++ b/drivers/media/dvb/frontends/stb0899_algo.c
@@ -277,7 +277,7 @@ static enum stb0899_status stb0899_check_carrier(struct stb0899_state *state)
277 277
278 reg = stb0899_read_reg(state, STB0899_CFD); 278 reg = stb0899_read_reg(state, STB0899_CFD);
279 STB0899_SETFIELD_VAL(CFD_ON, reg, 1); 279 STB0899_SETFIELD_VAL(CFD_ON, reg, 1);
280 stb0899_write_reg(state, STB0899_RTF, reg); 280 stb0899_write_reg(state, STB0899_CFD, reg);
281 281
282 reg = stb0899_read_reg(state, STB0899_DSTATUS); 282 reg = stb0899_read_reg(state, STB0899_DSTATUS);
283 dprintk(state->verbose, FE_DEBUG, 1, "--------------------> STB0899_DSTATUS=[0x%02x]", reg); 283 dprintk(state->verbose, FE_DEBUG, 1, "--------------------> STB0899_DSTATUS=[0x%02x]", reg);
@@ -311,7 +311,7 @@ static enum stb0899_status stb0899_search_carrier(struct stb0899_state *state)
311 311
312 reg = stb0899_read_reg(state, STB0899_CFD); 312 reg = stb0899_read_reg(state, STB0899_CFD);
313 STB0899_SETFIELD_VAL(CFD_ON, reg, 1); 313 STB0899_SETFIELD_VAL(CFD_ON, reg, 1);
314 stb0899_write_reg(state, STB0899_RTF, reg); 314 stb0899_write_reg(state, STB0899_CFD, reg);
315 315
316 do { 316 do {
317 dprintk(state->verbose, FE_DEBUG, 1, "Derot Freq=%d, mclk=%d", derot_freq, internal->mclk); 317 dprintk(state->verbose, FE_DEBUG, 1, "Derot Freq=%d, mclk=%d", derot_freq, internal->mclk);
@@ -326,7 +326,7 @@ static enum stb0899_status stb0899_search_carrier(struct stb0899_state *state)
326 if (next_loop) { 326 if (next_loop) {
327 reg = stb0899_read_reg(state, STB0899_CFD); 327 reg = stb0899_read_reg(state, STB0899_CFD);
328 STB0899_SETFIELD_VAL(CFD_ON, reg, 1); 328 STB0899_SETFIELD_VAL(CFD_ON, reg, 1);
329 stb0899_write_reg(state, STB0899_RTF, reg); 329 stb0899_write_reg(state, STB0899_CFD, reg);
330 330
331 STB0899_SETFIELD_VAL(CFRM, cfr[0], MSB(state->config->inversion * derot_freq)); 331 STB0899_SETFIELD_VAL(CFRM, cfr[0], MSB(state->config->inversion * derot_freq));
332 STB0899_SETFIELD_VAL(CFRL, cfr[1], LSB(state->config->inversion * derot_freq)); 332 STB0899_SETFIELD_VAL(CFRL, cfr[1], LSB(state->config->inversion * derot_freq));
@@ -429,7 +429,7 @@ static enum stb0899_status stb0899_search_data(struct stb0899_state *state)
429 dprintk(state->verbose, FE_DEBUG, 1, "Derot freq=%d, mclk=%d", derot_freq, internal->mclk); 429 dprintk(state->verbose, FE_DEBUG, 1, "Derot freq=%d, mclk=%d", derot_freq, internal->mclk);
430 reg = stb0899_read_reg(state, STB0899_CFD); 430 reg = stb0899_read_reg(state, STB0899_CFD);
431 STB0899_SETFIELD_VAL(CFD_ON, reg, 1); 431 STB0899_SETFIELD_VAL(CFD_ON, reg, 1);
432 stb0899_write_reg(state, STB0899_RTF, reg); 432 stb0899_write_reg(state, STB0899_CFD, reg);
433 433
434 STB0899_SETFIELD_VAL(CFRM, cfr[0], MSB(state->config->inversion * derot_freq)); 434 STB0899_SETFIELD_VAL(CFRM, cfr[0], MSB(state->config->inversion * derot_freq));
435 STB0899_SETFIELD_VAL(CFRL, cfr[1], LSB(state->config->inversion * derot_freq)); 435 STB0899_SETFIELD_VAL(CFRL, cfr[1], LSB(state->config->inversion * derot_freq));
@@ -608,7 +608,7 @@ enum stb0899_status stb0899_dvbs_algo(struct stb0899_state *state)
608 stb0899_write_reg(state, STB0899_RTF, reg); 608 stb0899_write_reg(state, STB0899_RTF, reg);
609 reg = stb0899_read_reg(state, STB0899_CFD); 609 reg = stb0899_read_reg(state, STB0899_CFD);
610 STB0899_SETFIELD_VAL(CFD_ON, reg, 1); 610 STB0899_SETFIELD_VAL(CFD_ON, reg, 1);
611 stb0899_write_reg(state, STB0899_RTF, reg); 611 stb0899_write_reg(state, STB0899_CFD, reg);
612 612
613 internal->derot_freq = 0; 613 internal->derot_freq = 0;
614 internal->status = NOAGC1; 614 internal->status = NOAGC1;
@@ -742,7 +742,7 @@ enum stb0899_status stb0899_dvbs_algo(struct stb0899_state *state)
742 /* disable carrier detector */ 742 /* disable carrier detector */
743 reg = stb0899_read_reg(state, STB0899_CFD); 743 reg = stb0899_read_reg(state, STB0899_CFD);
744 STB0899_SETFIELD_VAL(CFD_ON, reg, 0); 744 STB0899_SETFIELD_VAL(CFD_ON, reg, 0);
745 stb0899_write_reg(state, STB0899_RTF, reg); 745 stb0899_write_reg(state, STB0899_CFD, reg);
746 746
747 stb0899_read_regs(state, STB0899_EQUAI1, eq_const, 10); 747 stb0899_read_regs(state, STB0899_EQUAI1, eq_const, 10);
748 } 748 }