From 5ec7e276e7d926ab9da3fa38b016bda8fe451da8 Mon Sep 17 00:00:00 2001
From: Andy Walls <awalls@radix.net>
Date: Sun, 2 Nov 2008 18:54:10 -0300
Subject: [PATCH] --- yaml --- r: 124143 b: refs/heads/master c:
 f4167342b572c6122c712e8c6e5391808c1e5503 h: refs/heads/master i:   124141:
 5754d73da19f84029459df74df32be1dfd8ae30b   124139:
 303c80ac674bb8edec973e9e35af33d62fe2f92b   124135:
 9e66c386917c633a6fffaf255c3a4c7185593d03   124127:
 455fcaadacd5cc18b89e70b1523b1b0e092aaae5 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/video/cx18/cx18-av-core.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index bc57f442c8a6..9c5fef5109aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69acdf1e5a9146ec6667f6c4b439acd38c18f5ea
+refs/heads/master: f4167342b572c6122c712e8c6e5391808c1e5503
diff --git a/trunk/drivers/media/video/cx18/cx18-av-core.c b/trunk/drivers/media/video/cx18/cx18-av-core.c
index 5c079e35e611..518bd701d393 100644
--- a/trunk/drivers/media/video/cx18/cx18-av-core.c
+++ b/trunk/drivers/media/video/cx18/cx18-av-core.c
@@ -273,10 +273,9 @@ void cx18_av_std_setup(struct cx18 *cx)
 			pll_int, pll_frac, pll_post);
 
 	if (pll_post) {
-		int fin, fsc;
-		int pll = 28636363L * ((((u64)pll_int) << 25) + pll_frac);
+		int fin, fsc, pll;
 
-		pll >>= 25;
+		pll = (28636364L * ((((u64)pll_int) << 25) + pll_frac)) >> 25;
 		pll /= pll_post;
 		CX18_DEBUG_INFO("PLL = %d.%06d MHz\n",
 					pll / 1000000, pll % 1000000);