From: Sakari Ailus Date: Mon, 15 Sep 2014 21:47:32 +0000 (-0300) Subject: [media] smiapp-pll: Don't validate OP clocks if there are none X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=63516b55e3efed3a306ada6f79aa7052c83249ce;p=deliverable%2Flinux.git [media] smiapp-pll: Don't validate OP clocks if there are none For profile 0 sensors (which have no OP clocks), the OP limits are in fact VT limits. Do not verify them again. Signed-off-by: Sakari Ailus Acked-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/i2c/smiapp-pll.c b/drivers/media/i2c/smiapp-pll.c index cac1407b77fb..862ca0ca5362 100644 --- a/drivers/media/i2c/smiapp-pll.c +++ b/drivers/media/i2c/smiapp-pll.c @@ -131,6 +131,14 @@ static int check_all_bounds(struct device *dev, op_limits->min_pix_clk_freq_hz, op_limits->max_pix_clk_freq_hz, "op_pix_clk_freq_hz"); + + /* + * If there are no OP clocks, the VT clocks are contained in + * the OP clock struct. + */ + if (pll->flags & SMIAPP_PLL_FLAG_NO_OP_CLOCKS) + return rval; + if (!rval) rval = bounds_check( dev, pll->vt.sys_clk_freq_hz,