---

yaml --- r: 181541 b: refs/heads/master c: 0726681 h: refs/heads/master i: 181539: d8a5ada v: v3
git-mirror · Feb 26, 2010 · 8ff10e4 · 8ff10e4
1 parent cc36cbe
commit 8ff10e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);