From 2be64a32e9a45e033e7a95b8d26e94dd4f235c89 Mon Sep 17 00:00:00 2001
From: Malcolm Priestley <tvboxspy@gmail.com>
Date: Sun, 6 Jan 2013 08:40:42 -0300
Subject: [PATCH] --- yaml --- r: 357350 b: refs/heads/master c:
 a0a030bdbe612b7d8a941fba672300f7fc21b275 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/media/dvb-frontends/ds3000.c    | 10 ++++++++++
 trunk/drivers/media/dvb-frontends/m88rs2000.c |  4 +++-
 trunk/drivers/media/dvb-frontends/ts2020.c    |  1 -
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8b33ae765b11..f9317c4046f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 668a8b3b57e26a14a5172c84da0d861fb9f697d9
+refs/heads/master: a0a030bdbe612b7d8a941fba672300f7fc21b275
diff --git a/trunk/drivers/media/dvb-frontends/ds3000.c b/trunk/drivers/media/dvb-frontends/ds3000.c
index d128f85844e7..1e344b033277 100644
--- a/trunk/drivers/media/dvb-frontends/ds3000.c
+++ b/trunk/drivers/media/dvb-frontends/ds3000.c
@@ -533,6 +533,15 @@ static int ds3000_read_ber(struct dvb_frontend *fe, u32* ber)
 	return 0;
 }
 
+static int ds3000_read_signal_strength(struct dvb_frontend *fe,
+						u16 *signal_strength)
+{
+	if (fe->ops.tuner_ops.get_rf_strength)
+		fe->ops.tuner_ops.get_rf_strength(fe, signal_strength);
+
+	return 0;
+}
+
 /* calculate DS3000 snr value in dB */
 static int ds3000_read_snr(struct dvb_frontend *fe, u16 *snr)
 {
@@ -1102,6 +1111,7 @@ static struct dvb_frontend_ops ds3000_ops = {
 	.i2c_gate_ctrl = ds3000_i2c_gate_ctrl,
 	.read_status = ds3000_read_status,
 	.read_ber = ds3000_read_ber,
+	.read_signal_strength = ds3000_read_signal_strength,
 	.read_snr = ds3000_read_snr,
 	.read_ucblocks = ds3000_read_ucblocks,
 	.set_voltage = ds3000_set_voltage,
diff --git a/trunk/drivers/media/dvb-frontends/m88rs2000.c b/trunk/drivers/media/dvb-frontends/m88rs2000.c
index 283c90fee374..4da5272075cb 100644
--- a/trunk/drivers/media/dvb-frontends/m88rs2000.c
+++ b/trunk/drivers/media/dvb-frontends/m88rs2000.c
@@ -446,7 +446,9 @@ static int m88rs2000_read_ber(struct dvb_frontend *fe, u32 *ber)
 static int m88rs2000_read_signal_strength(struct dvb_frontend *fe,
 	u16 *strength)
 {
-	*strength = 0;
+	if (fe->ops.tuner_ops.get_rf_strength)
+		fe->ops.tuner_ops.get_rf_strength(fe, strength);
+
 	return 0;
 }
 
diff --git a/trunk/drivers/media/dvb-frontends/ts2020.c b/trunk/drivers/media/dvb-frontends/ts2020.c
index f50e237e1464..ad7ad857ab2a 100644
--- a/trunk/drivers/media/dvb-frontends/ts2020.c
+++ b/trunk/drivers/media/dvb-frontends/ts2020.c
@@ -363,7 +363,6 @@ struct dvb_frontend *ts2020_attach(struct dvb_frontend *fe,
 
 	memcpy(&fe->ops.tuner_ops, &ts2020_tuner_ops,
 				sizeof(struct dvb_tuner_ops));
-	fe->ops.read_signal_strength = fe->ops.tuner_ops.get_rf_strength;
 
 	return fe;
 }