From cfa0862026c1591fdb28b16ef5bcc4dbeca87ee2 Mon Sep 17 00:00:00 2001 From: Andreas Regel Date: Fri, 13 Nov 2009 18:18:53 -0300 Subject: [PATCH] --- yaml --- r: 174085 b: refs/heads/master c: c4fa649a3beca1e311d7f244de67306673f4c285 h: refs/heads/master i: 174083: a71c88416eef8d9cab9d26069d17b8c0a72b4ff7 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/stv090x.c | 7 +++---- trunk/drivers/media/dvb/frontends/stv090x_priv.h | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7adbe6e2c259..a523841cf8f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4978a83e51324aed08b1f1105a58f7e6491b751 +refs/heads/master: c4fa649a3beca1e311d7f244de67306673f4c285 diff --git a/trunk/drivers/media/dvb/frontends/stv090x.c b/trunk/drivers/media/dvb/frontends/stv090x.c index a2ec0ed48832..647c5354300f 100644 --- a/trunk/drivers/media/dvb/frontends/stv090x.c +++ b/trunk/drivers/media/dvb/frontends/stv090x.c @@ -3185,7 +3185,7 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state) if ((agc1_power == 0) && (power_iq < STV090x_IQPOWER_THRESHOLD)) { dprintk(FE_ERROR, 1, "No Signal: POWER_IQ=0x%02x", power_iq); lock = 0; - + signal_state = STV090x_NOAGC1; } else { reg = STV090x_READ_DEMOD(state, DEMOD); STV090x_SETFIELD_Px(reg, SPECINV_CONTROL_FIELD, state->inversion); @@ -3209,9 +3209,8 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state) } } - /* need to check for AGC1 state */ - - + if (signal_state == STV090x_NOAGC1) + return signal_state; if (state->algo == STV090x_BLIND_SEARCH) lock = stv090x_blind_search(state); diff --git a/trunk/drivers/media/dvb/frontends/stv090x_priv.h b/trunk/drivers/media/dvb/frontends/stv090x_priv.h index 5696816b88a4..5921a8d6c89f 100644 --- a/trunk/drivers/media/dvb/frontends/stv090x_priv.h +++ b/trunk/drivers/media/dvb/frontends/stv090x_priv.h @@ -91,6 +91,7 @@ STV090x_SEARCH_AGC2_TH_CUT30) enum stv090x_signal_state { + STV090x_NOAGC1, STV090x_NOCARRIER, STV090x_NODATA, STV090x_DATAOK,