diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-18 07:27:23 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-18 07:27:23 -0200 |
| commit | afa40a80ec7ad439b805d50be5c10a90b776b6fe (patch) | |
| tree | a80e6d322cea59937d3e5b4d4e95c42f4028b74e /linux/drivers/media/dvb/frontends | |
| parent | 6b758467e8ad1f6f860d74878d4aa59d85c558b8 (diff) | |
| download | mediapointer-dvb-s2-afa40a80ec7ad439b805d50be5c10a90b776b6fe.tar.gz mediapointer-dvb-s2-afa40a80ec7ad439b805d50be5c10a90b776b6fe.tar.bz2 | |
cx24116: fix retune regression introduced in 70ee86a7c630
From: Darron Broad <darron@kewl.org>
Thanks to AKPM for spotting this.
Priority: normal
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 'linux/drivers/media/dvb/frontends')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/cx24116.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/frontends/cx24116.c b/linux/drivers/media/dvb/frontends/cx24116.c index 46341cfba..44818232d 100644 --- a/linux/drivers/media/dvb/frontends/cx24116.c +++ b/linux/drivers/media/dvb/frontends/cx24116.c @@ -1224,7 +1224,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__); @@ -1241,7 +1241,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) { @@ -1269,7 +1268,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; |