aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2012-10-20 08:08:22 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-10-29 07:48:50 -0400
commitc2ebca00324ce7b89f756d5e182a5b3db938a4c9 (patch)
treeb7072a4502238efa37c389d2de113c13a3d7fe58 /drivers/media/i2c
parentb351f8663a3298103dbaef011a5068526ac556a9 (diff)
[media] smiapp-pll: Correct type for min_t()
Unsigned. Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/i2c')
-rw-r--r--drivers/media/i2c/smiapp-pll.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/i2c/smiapp-pll.c b/drivers/media/i2c/smiapp-pll.c
index 169f305e9121..e92dc46e6221 100644
--- a/drivers/media/i2c/smiapp-pll.c
+++ b/drivers/media/i2c/smiapp-pll.c
@@ -162,7 +162,7 @@ int smiapp_pll_calculate(struct device *dev, struct smiapp_pll_limits *limits,
162 more_mul_max); 162 more_mul_max);
163 /* Don't go above max pll op frequency. */ 163 /* Don't go above max pll op frequency. */
164 more_mul_max = 164 more_mul_max =
165 min_t(int, 165 min_t(uint32_t,
166 more_mul_max, 166 more_mul_max,
167 limits->max_pll_op_freq_hz 167 limits->max_pll_op_freq_hz
168 / (pll->ext_clk_freq_hz / pll->pre_pll_clk_div * mul)); 168 / (pll->ext_clk_freq_hz / pll->pre_pll_clk_div * mul));
@@ -322,7 +322,7 @@ int smiapp_pll_calculate(struct device *dev, struct smiapp_pll_limits *limits,
322 for (sys_div = min_sys_div; 322 for (sys_div = min_sys_div;
323 sys_div <= max_sys_div; 323 sys_div <= max_sys_div;
324 sys_div += 2 - (sys_div & 1)) { 324 sys_div += 2 - (sys_div & 1)) {
325 int pix_div = DIV_ROUND_UP(vt_div, sys_div); 325 uint16_t pix_div = DIV_ROUND_UP(vt_div, sys_div);
326 326
327 if (pix_div < limits->min_vt_pix_clk_div 327 if (pix_div < limits->min_vt_pix_clk_div
328 || pix_div > limits->max_vt_pix_clk_div) { 328 || pix_div > limits->max_vt_pix_clk_div) {