[media] v4l: aptina-pll: Round up minimum multiplier factor value properly
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Mon, 23 Apr 2012 12:59:25 +0000 (09:59 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 8 May 2012 17:26:41 +0000 (14:26 -0300)
The mf_low value must be a multiple of mf_inc. Round it up to the
nearest mf_inc multiple after computing it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/aptina-pll.c

index 0bd3813..8153a44 100644 (file)
@@ -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));