summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorIstvan Varga <istvan_v@mailbox.hu>2011-06-03 19:27:30 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-28 00:52:34 +0400
commit1368ceb266990af58a72cdb0e121eb4ff22bde6f (patch)
treebca06a1b0b6e714b2ea682897f67b472284c9da6 /drivers/media
parent5614942bb06f5620d0d6eb67bc0268c76c5dd921 (diff)
downloadlinux-1368ceb266990af58a72cdb0e121eb4ff22bde6f.tar.xz
[media] xc4000: fixed frequency error
The xc_get_frequency_error() function reported the frequency error incorrectly. The data read from the hardware is a signed integer, in 15625 Hz units. The attached patch fixes the bug. Signed-off-by: Istvan Varga <istvan_v@mailbox.hu> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/common/tuners/xc4000.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/common/tuners/xc4000.c b/drivers/media/common/tuners/xc4000.c
index be43a6dfac6c..f50dd6e713f7 100644
--- a/drivers/media/common/tuners/xc4000.c
+++ b/drivers/media/common/tuners/xc4000.c
@@ -417,8 +417,9 @@ static int xc_get_frequency_error(struct xc4000_priv *priv, u32 *freq_error_hz)
if (result != XC_RESULT_SUCCESS)
return result;
- tmp = (u32)regData;
- (*freq_error_hz) = (tmp * 15625) / 1000;
+ tmp = (u32)regData & 0xFFFFU;
+ tmp = (tmp < 0x8000U ? tmp : 0x10000U - tmp);
+ (*freq_error_hz) = tmp * 15625;
return result;
}