From 3ae6d7b60084f65e3fd37d3f646697d03d07c56b Mon Sep 17 00:00:00 2001 From: Darron Broad Date: Thu, 18 Dec 2008 06:27:23 -0300 Subject: [PATCH] --- yaml --- r: 124419 b: refs/heads/master c: 2fd9339664bc18a5345bbd6b855ff58273049f32 h: refs/heads/master i: 124417: 7e31de52a4059e3ff8d0b30ae41f80be532b37ab 124415: 14a62d04d72cd351ee77462b909e1419f120848b v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/cx24116.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 77312e2c6d53..60fbe9799f07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3569476dcebc7d6154815239ec982dee77511581 +refs/heads/master: 2fd9339664bc18a5345bbd6b855ff58273049f32 diff --git a/trunk/drivers/media/dvb/frontends/cx24116.c b/trunk/drivers/media/dvb/frontends/cx24116.c index 414bec9b5b64..a62ae5f578b0 100644 --- a/trunk/drivers/media/dvb/frontends/cx24116.c +++ b/trunk/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;