redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

V4L/DVB (11597): stv090x: fixes read_status to return 0 in case of no error

Browse source 
Signed-off-by: Andreas Regel <andreas.regel@gmx.de>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Andreas Regel 2009-04-23 14:58:36 -03:00 committed by Mauro Carvalho Chehab
parent 94871465b6
commit 9629c5b69d
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/media/dvb/frontends/stv090x.c
View file

@ -3163,7 +3163,6 @@ static int stv090x_read_status(struct dvb_frontend *fe, enum fe_status *status)
struct stv090x_state *state = fe->demodulator_priv; struct stv090x_state *state = fe->demodulator_priv;
u32 reg; u32 reg;
u8 search_state; u8 search_state;
int locked = 0;
reg = STV090x_READ_DEMOD(state, DMDSTATE); reg = STV090x_READ_DEMOD(state, DMDSTATE);
search_state = STV090x_GETFIELD_Px(reg, HEADER_MODE_FIELD); search_state = STV090x_GETFIELD_Px(reg, HEADER_MODE_FIELD);
@ -3173,7 +3172,7 @@ static int stv090x_read_status(struct dvb_frontend *fe, enum fe_status *status)
case 1: /* first PLH detected */ case 1: /* first PLH detected */
default: default:
dprintk(FE_DEBUG, 1, "Status: Unlocked (Searching ..)"); dprintk(FE_DEBUG, 1, "Status: Unlocked (Searching ..)");
locked = 0; *status = 0;
break; break;
case 2: /* DVB-S2 mode */ case 2: /* DVB-S2 mode */
@ -3182,7 +3181,6 @@ static int stv090x_read_status(struct dvb_frontend *fe, enum fe_status *status)
if (STV090x_GETFIELD_Px(reg, LOCK_DEFINITIF_FIELD)) { if (STV090x_GETFIELD_Px(reg, LOCK_DEFINITIF_FIELD)) {
reg = STV090x_READ_DEMOD(state, TSSTATUS); reg = STV090x_READ_DEMOD(state, TSSTATUS);
if (STV090x_GETFIELD_Px(reg, TSFIFO_LINEOK_FIELD)) { if (STV090x_GETFIELD_Px(reg, TSFIFO_LINEOK_FIELD)) {
locked = 1;
*status = FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK; *status = FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK;
} }
} }
@ -3196,7 +3194,6 @@ static int stv090x_read_status(struct dvb_frontend *fe, enum fe_status *status)
if (STV090x_GETFIELD_Px(reg, LOCKEDVIT_FIELD)) { if (STV090x_GETFIELD_Px(reg, LOCKEDVIT_FIELD)) {
reg = STV090x_READ_DEMOD(state, TSSTATUS); reg = STV090x_READ_DEMOD(state, TSSTATUS);
if (STV090x_GETFIELD_Px(reg, TSFIFO_LINEOK_FIELD)) { if (STV090x_GETFIELD_Px(reg, TSFIFO_LINEOK_FIELD)) {
locked = 1;
*status = FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK; *status = FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK;
} }
} }
@ -3204,7 +3201,7 @@ static int stv090x_read_status(struct dvb_frontend *fe, enum fe_status *status)
break; break;
} }
return locked; return 0;
} }
static int stv090x_read_per(struct dvb_frontend *fe, u32 *per) static int stv090x_read_per(struct dvb_frontend *fe, u32 *per)
@ -3215,7 +3212,8 @@ static int stv090x_read_per(struct dvb_frontend *fe, u32 *per)
u32 reg, h, m, l; u32 reg, h, m, l;
enum fe_status status; enum fe_status status;
if (!stv090x_read_status(fe, &status)) { stv090x_read_status(fe, &status);
if (!(status & FE_HAS_LOCK)) {
*per = 1 << 23; /* Max PER */ *per = 1 << 23; /* Max PER */
} else { } else {
/* Counter 2 */ /* Counter 2 */