diff --git a/[refs] b/[refs]
index 5d24e808dc94..d56804386ffb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5614942bb06f5620d0d6eb67bc0268c76c5dd921
+refs/heads/master: 1368ceb266990af58a72cdb0e121eb4ff22bde6f
diff --git a/trunk/drivers/media/common/tuners/xc4000.c b/trunk/drivers/media/common/tuners/xc4000.c
index be43a6dfac6c..f50dd6e713f7 100644
--- a/trunk/drivers/media/common/tuners/xc4000.c
+++ b/trunk/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;
 }