The patch number 9915 was added via Mauro Carvalho Chehab <mche...@redhat.com>
to http://linuxtv.org/hg/v4l-dvb master development tree.

Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel

If anyone has any objections, please let us know by sending a message to:
        v4l-dvb-maintai...@linuxtv.org

------

From: Darron Broad  <dar...@kewl.org>
cx24116: fix retune regression introduced in 70ee86a7c630


Thanks to AKPM for spotting this.

Priority: normal

CC: Steven Toth <st...@hauppauge.com>
Signed-off-by: Darron Broad <dar...@kewl.org>
Signed-off-by: Mauro Carvalho Chehab <mche...@redhat.com>


---

 linux/drivers/media/dvb/frontends/cx24116.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff -r aa089f21be00 -r 5196c1463968 linux/drivers/media/dvb/frontends/cx24116.c
--- a/linux/drivers/media/dvb/frontends/cx24116.c       Thu Dec 18 07:21:51 
2008 -0200
+++ b/linux/drivers/media/dvb/frontends/cx24116.c       Thu Dec 18 07:27:23 
2008 -0200
@@ -1224,7 +1224,7 @@ static int cx24116_set_frontend(struct d
        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 d
 
                /* 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 d
                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;


---

Patch is available at: 
http://linuxtv.org/hg/v4l-dvb/rev/5196c1463968c02b5bc5c128044dcabda986e395

_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to