diff options
Diffstat (limited to 'drivers/media/video/omap3isp/ispccdc.c')
-rw-r--r-- | drivers/media/video/omap3isp/ispccdc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/omap3isp/ispccdc.c b/drivers/media/video/omap3isp/ispccdc.c index 8c73197005c6..080fe8b513b1 100644 --- a/drivers/media/video/omap3isp/ispccdc.c +++ b/drivers/media/video/omap3isp/ispccdc.c | |||
@@ -839,8 +839,8 @@ static void ccdc_config_vp(struct isp_ccdc_device *ccdc) | |||
839 | 839 | ||
840 | if (pipe->input) | 840 | if (pipe->input) |
841 | div = DIV_ROUND_UP(l3_ick, pipe->max_rate); | 841 | div = DIV_ROUND_UP(l3_ick, pipe->max_rate); |
842 | else if (ccdc->vpcfg.pixelclk) | 842 | else if (pipe->external_rate) |
843 | div = l3_ick / ccdc->vpcfg.pixelclk; | 843 | div = l3_ick / pipe->external_rate; |
844 | 844 | ||
845 | div = clamp(div, 2U, max_div); | 845 | div = clamp(div, 2U, max_div); |
846 | fmtcfg_vp |= (div - 2) << ISPCCDC_FMTCFG_VPIF_FRQ_SHIFT; | 846 | fmtcfg_vp |= (div - 2) << ISPCCDC_FMTCFG_VPIF_FRQ_SHIFT; |
@@ -2433,8 +2433,6 @@ int omap3isp_ccdc_init(struct isp_device *isp) | |||
2433 | ccdc->clamp.oblen = 0; | 2433 | ccdc->clamp.oblen = 0; |
2434 | ccdc->clamp.dcsubval = 0; | 2434 | ccdc->clamp.dcsubval = 0; |
2435 | 2435 | ||
2436 | ccdc->vpcfg.pixelclk = 0; | ||
2437 | |||
2438 | ccdc->update = OMAP3ISP_CCDC_BLCLAMP; | 2436 | ccdc->update = OMAP3ISP_CCDC_BLCLAMP; |
2439 | ccdc_apply_controls(ccdc); | 2437 | ccdc_apply_controls(ccdc); |
2440 | 2438 | ||