Merge "msm: camera: isp: Fix completion variable initialization" into dev/msm-4.9-camx (cf777ae6) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -1611,6 +1611,9 @@ static int cam_ife_mgr_config_hw(void *hw_mgr_priv,
		cdm_cmd->cmd[i].len = cmd->len;
		}

		if (cfg->request_id == 1)
		init_completion(&ctx->config_done_complete);

		CAM_DBG(CAM_ISP, "Submit to CDM");
		rc = cam_cdm_submit_bls(ctx->cdm_handle, cdm_cmd);
		if (rc) {
		@@ -1619,7 +1622,6 @@ static int cam_ife_mgr_config_hw(void *hw_mgr_priv,
		}

		if (cfg->request_id == 1) {
		init_completion(&ctx->config_done_complete);
		rc = wait_for_completion_timeout(
		&ctx->config_done_complete,
		msecs_to_jiffies(30));
		@@ -4178,6 +4180,8 @@ int cam_ife_hw_mgr_init(struct cam_hw_mgr_intf *hw_mgr_intf)
		g_ife_hw_mgr.ctx_pool[i].common.tasklet_info =
		g_ife_hw_mgr.mgr_common.tasklet_pool[i];


		init_completion(&g_ife_hw_mgr.ctx_pool[i].config_done_complete);
		list_add_tail(&g_ife_hw_mgr.ctx_pool[i].list,
		&g_ife_hw_mgr.free_ctx_list);
		}