aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/dvb/frontends/stv090x.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/dvb/frontends/stv090x.c b/drivers/media/dvb/frontends/stv090x.c
index d79e69f65cbb..d229dba42bef 100644
--- a/drivers/media/dvb/frontends/stv090x.c
+++ b/drivers/media/dvb/frontends/stv090x.c
@@ -3172,7 +3172,7 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
3172 enum stv090x_signal_state signal_state = STV090x_NOCARRIER; 3172 enum stv090x_signal_state signal_state = STV090x_NOCARRIER;
3173 u32 reg; 3173 u32 reg;
3174 s32 agc1_power, power_iq = 0, i; 3174 s32 agc1_power, power_iq = 0, i;
3175 int lock = 0, low_sr = 0, no_signal = 0; 3175 int lock = 0, low_sr = 0;
3176 3176
3177 reg = STV090x_READ_DEMOD(state, TSCFGH); 3177 reg = STV090x_READ_DEMOD(state, TSCFGH);
3178 STV090x_SETFIELD_Px(reg, RST_HWARE_FIELD, 1); /* Stop path 1 stream merger */ 3178 STV090x_SETFIELD_Px(reg, RST_HWARE_FIELD, 1); /* Stop path 1 stream merger */
@@ -3411,10 +3411,9 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
3411 /* Reset the packet Error counter2 */ 3411 /* Reset the packet Error counter2 */
3412 if (STV090x_WRITE_DEMOD(state, ERRCTRL2, 0xc1) < 0) 3412 if (STV090x_WRITE_DEMOD(state, ERRCTRL2, 0xc1) < 0)
3413 goto err; 3413 goto err;
3414 } else { 3414 } else
3415 signal_state = STV090x_NODATA; 3415 signal_state = STV090x_NODATA;
3416 no_signal = stv090x_chk_signal(state); 3416
3417 }
3418 } 3417 }
3419 return signal_state; 3418 return signal_state;
3420 3419