From b786c4e82bcbff0e0a59535ca5cfa1ccc0b21a86 Mon Sep 17 00:00:00 2001 From: Peter Meerwald Date: Thu, 21 Jun 2012 13:46:05 -0300 Subject: [PATCH] --- yaml --- r: 330739 b: refs/heads/master c: 13eaaa7f2fa1d2bd247d68792bf187239a24a33f h: refs/heads/master i: 330737: b2145afb25547fe959f23865957ade36934a7129 330735: c23b354eb6c8f8755a92c3da483fa09bcd1e1ee0 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/omap3isp/ispccdc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4646058ece4f..04b713397145 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96d62ae2dced8ec29d3fc985ff15505a65256906 +refs/heads/master: 13eaaa7f2fa1d2bd247d68792bf187239a24a33f diff --git a/trunk/drivers/media/video/omap3isp/ispccdc.c b/trunk/drivers/media/video/omap3isp/ispccdc.c index f1220d3d4970..9d7ca9b4c925 100644 --- a/trunk/drivers/media/video/omap3isp/ispccdc.c +++ b/trunk/drivers/media/video/omap3isp/ispccdc.c @@ -835,7 +835,7 @@ static void ccdc_config_vp(struct isp_ccdc_device *ccdc) case 13: fmtcfg_vp |= ISPCCDC_FMTCFG_VPIN_12_3; break; - }; + } if (pipe->input) div = DIV_ROUND_UP(l3_ick, pipe->max_rate); @@ -991,7 +991,7 @@ static void ccdc_config_sync_if(struct isp_ccdc_device *ccdc, case 12: syn_mode |= ISPCCDC_SYN_MODE_DATSIZ_12; break; - }; + } if (syncif->fldmode) syn_mode |= ISPCCDC_SYN_MODE_FLDMODE;