aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/dvb-frontends/ds3000.c10
-rw-r--r--drivers/media/dvb-frontends/m88rs2000.c4
-rw-r--r--drivers/media/dvb-frontends/ts2020.c1
3 files changed, 13 insertions, 2 deletions
diff --git a/drivers/media/dvb-frontends/ds3000.c b/drivers/media/dvb-frontends/ds3000.c
index d128f85844e7..1e344b033277 100644
--- a/drivers/media/dvb-frontends/ds3000.c
+++ b/drivers/media/dvb-frontends/ds3000.c
@@ -533,6 +533,15 @@ static int ds3000_read_ber(struct dvb_frontend *fe, u32* ber)
533 return 0; 533 return 0;
534} 534}
535 535
536static int ds3000_read_signal_strength(struct dvb_frontend *fe,
537 u16 *signal_strength)
538{
539 if (fe->ops.tuner_ops.get_rf_strength)
540 fe->ops.tuner_ops.get_rf_strength(fe, signal_strength);
541
542 return 0;
543}
544
536/* calculate DS3000 snr value in dB */ 545/* calculate DS3000 snr value in dB */
537static int ds3000_read_snr(struct dvb_frontend *fe, u16 *snr) 546static int ds3000_read_snr(struct dvb_frontend *fe, u16 *snr)
538{ 547{
@@ -1102,6 +1111,7 @@ static struct dvb_frontend_ops ds3000_ops = {
1102 .i2c_gate_ctrl = ds3000_i2c_gate_ctrl, 1111 .i2c_gate_ctrl = ds3000_i2c_gate_ctrl,
1103 .read_status = ds3000_read_status, 1112 .read_status = ds3000_read_status,
1104 .read_ber = ds3000_read_ber, 1113 .read_ber = ds3000_read_ber,
1114 .read_signal_strength = ds3000_read_signal_strength,
1105 .read_snr = ds3000_read_snr, 1115 .read_snr = ds3000_read_snr,
1106 .read_ucblocks = ds3000_read_ucblocks, 1116 .read_ucblocks = ds3000_read_ucblocks,
1107 .set_voltage = ds3000_set_voltage, 1117 .set_voltage = ds3000_set_voltage,
diff --git a/drivers/media/dvb-frontends/m88rs2000.c b/drivers/media/dvb-frontends/m88rs2000.c
index 283c90fee374..4da5272075cb 100644
--- a/drivers/media/dvb-frontends/m88rs2000.c
+++ b/drivers/media/dvb-frontends/m88rs2000.c
@@ -446,7 +446,9 @@ static int m88rs2000_read_ber(struct dvb_frontend *fe, u32 *ber)
446static int m88rs2000_read_signal_strength(struct dvb_frontend *fe, 446static int m88rs2000_read_signal_strength(struct dvb_frontend *fe,
447 u16 *strength) 447 u16 *strength)
448{ 448{
449 *strength = 0; 449 if (fe->ops.tuner_ops.get_rf_strength)
450 fe->ops.tuner_ops.get_rf_strength(fe, strength);
451
450 return 0; 452 return 0;
451} 453}
452 454
diff --git a/drivers/media/dvb-frontends/ts2020.c b/drivers/media/dvb-frontends/ts2020.c
index f50e237e1464..ad7ad857ab2a 100644
--- a/drivers/media/dvb-frontends/ts2020.c
+++ b/drivers/media/dvb-frontends/ts2020.c
@@ -363,7 +363,6 @@ struct dvb_frontend *ts2020_attach(struct dvb_frontend *fe,
363 363
364 memcpy(&fe->ops.tuner_ops, &ts2020_tuner_ops, 364 memcpy(&fe->ops.tuner_ops, &ts2020_tuner_ops,
365 sizeof(struct dvb_tuner_ops)); 365 sizeof(struct dvb_tuner_ops));
366 fe->ops.read_signal_strength = fe->ops.tuner_ops.get_rf_strength;
367 366
368 return fe; 367 return fe;
369} 368}