From 176afab43314139aa2bc514a7d5646af905aa695 Mon Sep 17 00:00:00 2001 From: Lokesh Gupta Date: Tue, 10 Jan 2012 14:48:50 +0100 Subject: [PATCH] [PORT FROM R2] atomisp: Disable selction of advanced binary when MACC is used BZ: 20531 MACC was not available in the primary binary, and hence when MACC was selected by the user, advanced binary was chosen by default. With this patch, primary binary will be selected when MACC is set by the user. Change-Id: I45a64a5ebc1f61f2bb2555fef79c5bdedb86bb44 Orig-Change-Id: I11a030aba0d750390990a4dcdf93ccdc82e6ecc6 Signed-off-by: Lokesh Gupta Reviewed-on: http://android.intel.com:8080/31406 Reviewed-by: Kruger, Jozef Reviewed-by: Cohen, David A Tested-by: Lampila, KalleX Reviewed-by: buildbot Tested-by: buildbot Reviewed-on: http://android.intel.com:8080/32450 Reviewed-by: Lampila, KalleX --- drivers/media/video/atomisp/atomisp_cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/video/atomisp/atomisp_cmd.c b/drivers/media/video/atomisp/atomisp_cmd.c index 77cfc7c..2b307fc 100644 --- a/drivers/media/video/atomisp/atomisp_cmd.c +++ b/drivers/media/video/atomisp/atomisp_cmd.c @@ -1277,7 +1277,7 @@ static void atomisp_update_capture_mode(struct atomisp_device *isp) { if (isp->params.low_light) { sh_css_capture_set_mode(SH_CSS_CAPTURE_MODE_LOW_LIGHT); - } else if (isp->params.gdc_cac_en || isp->params.macc_en) { + } else if (isp->params.gdc_cac_en ) { sh_css_capture_set_mode(SH_CSS_CAPTURE_MODE_ADVANCED); } else { sh_css_capture_set_mode(SH_CSS_CAPTURE_MODE_PRIMARY); -- 2.7.4