Skip to content

Commit

Permalink
V4L/DVB (9915): cx24116: fix retune regression introduced in 70ee86a7…
Browse files Browse the repository at this point in the history
…c630

Thanks to AKPM for spotting this.

Cc: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Darron Broad <darron@kewl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Darron Broad authored and Mauro Carvalho Chehab committed Dec 30, 2008
1 parent 3569476 commit 2fd9339
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/media/dvb/frontends/cx24116.c
Original file line number Diff line number Diff line change
Expand Up @@ -1207,7 +1207,7 @@ static int cx24116_set_frontend(struct dvb_frontend *fe,
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
struct cx24116_cmd cmd;
fe_status_t tunerstat;
int i, status, ret, retune;
int i, status, ret, retune = 1;

dprintk("%s()\n", __func__);

Expand All @@ -1224,7 +1224,6 @@ static int cx24116_set_frontend(struct dvb_frontend *fe,

/* Pilot doesn't exist in DVB-S, turn bit off */
state->dnxt.pilot_val = CX24116_PILOT_OFF;
retune = 1;

/* DVB-S only supports 0.35 */
if (c->rolloff != ROLLOFF_35) {
Expand Down Expand Up @@ -1252,7 +1251,7 @@ static int cx24116_set_frontend(struct dvb_frontend *fe,
case PILOT_AUTO: /* Not supported but emulated */
state->dnxt.pilot_val = (c->modulation == QPSK)
? CX24116_PILOT_OFF : CX24116_PILOT_ON;
retune = 2;
retune++;
break;
case PILOT_OFF:
state->dnxt.pilot_val = CX24116_PILOT_OFF;
Expand Down

0 comments on commit 2fd9339

Please sign in to comment.