Merge "msm: camera: isp: Wait for cdm submit incase of custom HW" into camera-kernel.lnx.4.0 (da1731a1) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3966,7 +3966,8 @@ static int cam_ife_mgr_config_hw(void *hw_mgr_priv,
	return rc;		return rc;
	}		}

	if (cfg->init_packet) {		if (cfg->init_packet \|\|
			(ctx->custom_config & CAM_IFE_CUSTOM_CFG_SW_SYNC_ON)) {
	rem_jiffies = wait_for_completion_timeout(		rem_jiffies = wait_for_completion_timeout(
	&ctx->config_done_complete,		&ctx->config_done_complete,
	msecs_to_jiffies(60));		msecs_to_jiffies(60));