summaryrefslogtreecommitdiff
path: root/drivers/media/dvb/frontends/cx24116.c
diff options
context:
space:
mode:
authorDarron Broad <darron@kewl.org>2008-12-18 12:27:23 +0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 14:39:16 +0300
commit2fd9339664bc18a5345bbd6b855ff58273049f32 (patch)
treed6786e6e7367c75b068a1cbe7a63c5a0cce7af51 /drivers/media/dvb/frontends/cx24116.c
parent3569476dcebc7d6154815239ec982dee77511581 (diff)
downloadlinux-2fd9339664bc18a5345bbd6b855ff58273049f32.tar.xz
V4L/DVB (9915): cx24116: fix retune regression introduced in 70ee86a7c630
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>
Diffstat (limited to 'drivers/media/dvb/frontends/cx24116.c')
-rw-r--r--drivers/media/dvb/frontends/cx24116.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/dvb/frontends/cx24116.c b/drivers/media/dvb/frontends/cx24116.c
index 414bec9b5b64..a62ae5f578b0 100644
--- a/drivers/media/dvb/frontends/cx24116.c
+++ b/drivers/media/dvb/frontends/cx24116.c
@@ -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__);
@@ -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) {
@@ -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;