From 8ff10e43f70a1aafa69e3913ebecda96b392bdf1 Mon Sep 17 00:00:00 2001 From: Abylay Ospan Date: Fri, 22 Jan 2010 16:01:44 -0300 Subject: [PATCH] --- yaml --- r: 181541 b: refs/heads/master c: 0726681a7080cef6a9fd414894690fac16418772 h: refs/heads/master i: 181539: d8a5adae2a4ca0992b86d67ba9c4037983fbb13b v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/lnbp21.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 90ed0d8b5d1c..e5e32c6a61a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b54ee082543294a04ea1d758abdc6013cbb4e2e +refs/heads/master: 0726681a7080cef6a9fd414894690fac16418772 diff --git a/trunk/drivers/media/dvb/frontends/lnbp21.c b/trunk/drivers/media/dvb/frontends/lnbp21.c index 49d2b1c16119..13437259eeac 100644 --- a/trunk/drivers/media/dvb/frontends/lnbp21.c +++ b/trunk/drivers/media/dvb/frontends/lnbp21.c @@ -158,7 +158,7 @@ static struct dvb_frontend *lnbx2x_attach(struct dvb_frontend *fe, /* override frontend ops */ fe->ops.set_voltage = lnbp21_set_voltage; fe->ops.enable_high_lnb_voltage = lnbp21_enable_high_lnb_voltage; - if (!fe->ops.set_tone) /* don't redefine */ + if (!(override_clear & LNBH24_TEN)) /*22kHz logic controlled by demod*/ fe->ops.set_tone = lnbp21_set_tone; printk(KERN_INFO "LNBx2x attached on addr=%x\n", lnbp21->i2c_addr);