diff --git a/[refs] b/[refs]
index 4bae313477f4..433cbc6af13b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 433f75ab3d09a666c745d4163e21e811582d8eda
+refs/heads/master: 31ed29f9812a9cb9a1c6d270ff4e19da60046da1
diff --git a/trunk/drivers/media/video/aptina-pll.c b/trunk/drivers/media/video/aptina-pll.c
index 0bd3813bb59d..8153a449846b 100644
--- a/trunk/drivers/media/video/aptina-pll.c
+++ b/trunk/drivers/media/video/aptina-pll.c
@@ -148,9 +148,8 @@ int aptina_pll_calculate(struct device *dev,
 		unsigned int mf_high;
 		unsigned int mf_low;
 
-		mf_low = max(roundup(mf_min, mf_inc),
-			     DIV_ROUND_UP(pll->ext_clock * p1,
-			       limits->int_clock_max * div));
+		mf_low = roundup(max(mf_min, DIV_ROUND_UP(pll->ext_clock * p1,
+					limits->int_clock_max * div)), mf_inc);
 		mf_high = min(mf_max, pll->ext_clock * p1 /
 			      (limits->int_clock_min * div));