---

yaml --- r: 285667 b: refs/heads/master c: 3308e2b h: refs/heads/master i: 285665: 7bfaae3 285663: 6d5abc6 v: v3
git-mirror · Jan 5, 2012 · 4d13c4f · 4d13c4f
1 parent 5c11a2b
commit 4d13c4f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51ada787b89828314f09cb6b2f401c209db88917
+refs/heads/master: 3308e2b53a6737d28782c89e6d2dd80237fde3e3
diff --git a/trunk/drivers/media/video/cx25840/cx25840-core.c b/trunk/drivers/media/video/cx25840/cx25840-core.c
@@ -43,6 +43,7 @@
 #include <linux/videodev2.h>
 #include <linux/i2c.h>
 #include <linux/delay.h>
+#include <linux/math64.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/cx25840.h>
@@ -2022,7 +2023,7 @@ void cx23885_dif_setup(struct i2c_client *client, u32 ifHz)
 
 	/* Assuming TV */
 	/* Calculate the PLL frequency word based on the adjusted ifHz */
-        pll_freq = ((u64)ifHz * 268435456) / 50000000;
+        pll_freq = div_u64((u64)ifHz * 268435456, 50000000);
         pll_freq_word = (u32)pll_freq;
 
         cx25840_write4(client, DIF_PLL_FREQ_WORD,  pll_freq_word);