---

yaml --- r: 181508 b: refs/heads/master c: ceb59cf h: refs/heads/master v: v3
git-mirror · Feb 26, 2010 · 738f6a7 · 738f6a7
1 parent aec0064
commit 738f6a7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c52af79916028f9d15638519b54a80ed1c10bce5
+refs/heads/master: ceb59cf068d54761c653c42dd45c14e1ecf0f7d3
diff --git a/trunk/drivers/media/dvb/frontends/lnbp21.c b/trunk/drivers/media/dvb/frontends/lnbp21.c
@@ -158,7 +158,8 @@ 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;
-	fe->ops.set_tone = lnbp21_set_tone;
+	if (!fe->ops.set_tone) /* don't redefine */
+		fe->ops.set_tone = lnbp21_set_tone;
 	printk(KERN_INFO "LNBx2x attached on addr=%x\n", lnbp21->i2c_addr);
 
 	return fe;