aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/dvb-frontends
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2013-03-22 06:37:32 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-22 09:46:45 -0300
commit48f72a1a4caaaac6cc22b6c4b6471286955a590d (patch)
treebd2fcff2352cc51a87292dfde0f3ed5a9028cd9e /drivers/media/dvb-frontends
parentf35d09db0e61009679e41cc5afa2d205b99c3816 (diff)
downloadvexpress-lsk-48f72a1a4caaaac6cc22b6c4b6471286955a590d.tar.gz
[media] drxk: fix CNR calculus
Changeset 8f3741e accidentally broke the CNR estimation. It should be calculated as "a + b - c". However, previously, the subtraction by c only occurred if SNR would be positive, due to a bad binding to DVBv3 API. This also fixes the following warning: drivers/media/dvb-frontends/drxk_hard.c:2556:6: warning: variable 'c' set but not used [-Wunused-but-set-variable] Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb-frontends')
-rw-r--r--drivers/media/dvb-frontends/drxk_hard.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c
index fc93bd396cf..55a4c22ac2d 100644
--- a/drivers/media/dvb-frontends/drxk_hard.c
+++ b/drivers/media/dvb-frontends/drxk_hard.c
@@ -2628,7 +2628,7 @@ static int GetDVBTSignalToNoise(struct drxk_state *state,
/* log(x) x = (16bits + 16bits) << 15 ->32 bits */
c = Log10Times100(SqrErrIQ);
- iMER = a + b;
+ iMER = a + b - c;
}
*pSignalToNoise = iMER;