From 394a75249298f7791500dd25dc55e964956b3f5b Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue, 31 Jul 2012 16:38:41 -0300
Subject: [PATCH] --- yaml --- r: 320703 b: refs/heads/master c:
 adfe1560de1c696324554fba70c92f2d7c947ff7 h: refs/heads/master i:   320701:
 0d76097fca8f659beaf5a7150d57773db6fdb92b   320699:
 3c1617a3d7a82cd73af3d1ff1ea4da0a49da8714   320695:
 46daf0145367e18f0f8d3ef4dfc4b6df208af4a8   320687:
 8f2d5e9123a09815593db966ba7de5353c711b40   320671:
 80726949a11347e91efa0819e5e59f4a42e9499c   320639:
 4eae4a9e6fdf16e89347f3df8d591dbae30943e5 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/media/radio/radio-tea5777.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 693a2249d2fa..34faac9fab64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d98015eef6fa97b0cbba7310041ab75b223524b
+refs/heads/master: adfe1560de1c696324554fba70c92f2d7c947ff7
diff --git a/trunk/drivers/media/radio/radio-tea5777.c b/trunk/drivers/media/radio/radio-tea5777.c
index 3e12179364f8..5bc9fa62720b 100644
--- a/trunk/drivers/media/radio/radio-tea5777.c
+++ b/trunk/drivers/media/radio/radio-tea5777.c
@@ -33,6 +33,7 @@
 #include <media/v4l2-fh.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-event.h>
+#include <asm/div64.h>
 #include "radio-tea5777.h"
 
 MODULE_AUTHOR("Hans de Goede <perex@perex.cz>");
@@ -158,10 +159,11 @@ static int radio_tea5777_set_freq(struct radio_tea5777 *tea)
 	int res;
 
 	freq = clamp_t(u32, tea->freq,
-		       TEA5777_FM_RANGELOW, TEA5777_FM_RANGEHIGH);
-	freq = (freq + 8) / 16; /* to kHz */
+		       TEA5777_FM_RANGELOW, TEA5777_FM_RANGEHIGH) + 8;
+	do_div(freq, 16); /* to kHz */
 
-	freq = (freq - TEA5777_FM_IF) / TEA5777_FM_FREQ_STEP;
+	freq -= TEA5777_FM_IF;
+	do_div(freq, TEA5777_FM_FREQ_STEP);
 
 	tea->write_reg &= ~(TEA5777_W_FM_PLL_MASK | TEA5777_W_FM_FREF_MASK);
 	tea->write_reg |= freq << TEA5777_W_FM_PLL_SHIFT;