diff options
| author | Antti Palosaari <crope@iki.fi> | 2014-12-09 16:27:32 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-02 22:55:51 +0300 |
| commit | f491391cc331921524aed578075e93f622a5e533 (patch) | |
| tree | 82521abc5462e291e5c2b5f74971b9a583474470 | |
| parent | d512e286512c38e8921317c3a2c772559a91a636 (diff) | |
| download | linux-f491391cc331921524aed578075e93f622a5e533.tar.xz | |
[media] rtl2830: wrap DVBv5 BER to DVBv3
Change legacy DVBv3 read BER to return values calculated by DVBv5
statistics.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
| -rw-r--r-- | drivers/media/dvb-frontends/rtl2830.c | 15 | ||||
| -rw-r--r-- | drivers/media/dvb-frontends/rtl2830_priv.h | 1 |
2 files changed, 3 insertions, 13 deletions
diff --git a/drivers/media/dvb-frontends/rtl2830.c b/drivers/media/dvb-frontends/rtl2830.c index a02ccdf2fda0..0112b3f13a4b 100644 --- a/drivers/media/dvb-frontends/rtl2830.c +++ b/drivers/media/dvb-frontends/rtl2830.c @@ -596,22 +596,11 @@ static int rtl2830_read_ber(struct dvb_frontend *fe, u32 *ber) { struct i2c_client *client = fe->demodulator_priv; struct rtl2830_dev *dev = i2c_get_clientdata(client); - int ret; - u8 buf[2]; - - if (dev->sleeping) - return 0; - - ret = rtl2830_rd_regs(client, 0x34e, buf, 2); - if (ret) - goto err; - *ber = buf[0] << 8 | buf[1]; + *ber = (dev->post_bit_error - dev->post_bit_error_prev); + dev->post_bit_error_prev = dev->post_bit_error; return 0; -err: - dev_dbg(&client->dev, "failed=%d\n", ret); - return ret; } static int rtl2830_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks) diff --git a/drivers/media/dvb-frontends/rtl2830_priv.h b/drivers/media/dvb-frontends/rtl2830_priv.h index cdcaacfa89c8..6636834baf20 100644 --- a/drivers/media/dvb-frontends/rtl2830_priv.h +++ b/drivers/media/dvb-frontends/rtl2830_priv.h @@ -32,6 +32,7 @@ struct rtl2830_dev { u8 page; /* active register page */ struct delayed_work stat_work; fe_status_t fe_status; + u64 post_bit_error_prev; /* for old DVBv3 read_ber() calculation */ u64 post_bit_error; u64 post_bit_count; }; |