diff options
author | Darron Broad <darron@kewl.org> | 2008-12-18 04:27:23 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 06:39:16 -0500 |
commit | 2fd9339664bc18a5345bbd6b855ff58273049f32 (patch) | |
tree | d6786e6e7367c75b068a1cbe7a63c5a0cce7af51 /drivers/media/dvb | |
parent | 3569476dcebc7d6154815239ec982dee77511581 (diff) |
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')
-rw-r--r-- | drivers/media/dvb/frontends/cx24116.c | 5 |
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, | |||
1207 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 1207 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
1208 | struct cx24116_cmd cmd; | 1208 | struct cx24116_cmd cmd; |
1209 | fe_status_t tunerstat; | 1209 | fe_status_t tunerstat; |
1210 | int i, status, ret, retune; | 1210 | int i, status, ret, retune = 1; |
1211 | 1211 | ||
1212 | dprintk("%s()\n", __func__); | 1212 | dprintk("%s()\n", __func__); |
1213 | 1213 | ||
@@ -1224,7 +1224,6 @@ static int cx24116_set_frontend(struct dvb_frontend *fe, | |||
1224 | 1224 | ||
1225 | /* Pilot doesn't exist in DVB-S, turn bit off */ | 1225 | /* Pilot doesn't exist in DVB-S, turn bit off */ |
1226 | state->dnxt.pilot_val = CX24116_PILOT_OFF; | 1226 | state->dnxt.pilot_val = CX24116_PILOT_OFF; |
1227 | retune = 1; | ||
1228 | 1227 | ||
1229 | /* DVB-S only supports 0.35 */ | 1228 | /* DVB-S only supports 0.35 */ |
1230 | if (c->rolloff != ROLLOFF_35) { | 1229 | if (c->rolloff != ROLLOFF_35) { |
@@ -1252,7 +1251,7 @@ static int cx24116_set_frontend(struct dvb_frontend *fe, | |||
1252 | case PILOT_AUTO: /* Not supported but emulated */ | 1251 | case PILOT_AUTO: /* Not supported but emulated */ |
1253 | state->dnxt.pilot_val = (c->modulation == QPSK) | 1252 | state->dnxt.pilot_val = (c->modulation == QPSK) |
1254 | ? CX24116_PILOT_OFF : CX24116_PILOT_ON; | 1253 | ? CX24116_PILOT_OFF : CX24116_PILOT_ON; |
1255 | retune = 2; | 1254 | retune++; |
1256 | break; | 1255 | break; |
1257 | case PILOT_OFF: | 1256 | case PILOT_OFF: |
1258 | state->dnxt.pilot_val = CX24116_PILOT_OFF; | 1257 | state->dnxt.pilot_val = CX24116_PILOT_OFF; |