diff --git a/[refs] b/[refs]
index 2cf71917874c..c3d6f161c2fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e6dc88f3777bedaf7cec5987b251975a3d14d3d
+refs/heads/master: 9dc72160d13c6fdeec57f5c6017588812c4294b6
diff --git a/trunk/drivers/media/tuners/fc2580.c b/trunk/drivers/media/tuners/fc2580.c
index dacf85578c4b..aff39ae457a0 100644
--- a/trunk/drivers/media/tuners/fc2580.c
+++ b/trunk/drivers/media/tuners/fc2580.c
@@ -168,8 +168,7 @@ static int fc2580_set_params(struct dvb_frontend *fe)
 	}
 
 	f_ref = 2UL * priv->cfg->clock / r_val;
-	n_val = f_vco / f_ref;
-	k_val = f_vco % f_ref;
+	n_val = div_u64_rem(f_vco, f_ref, &k_val);
 	k_val_reg = 1UL * k_val * (1 << 20) / f_ref;
 
 	ret = fc2580_wr_reg(priv, 0x18, r18_val | ((k_val_reg >> 16) & 0xff));