Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf2e8610 authored by Kyle Piefer's avatar Kyle Piefer
Browse files

msm: camera: icp: Make sure to set bitmap to NULL 



For proper clean up, set the bitmap pointer to NULL
after freeing it. Also, make sure that the context
mutex is properly locked and unlocked.

CRs-Fixed: 2097654
Change-Id: I6bea32eb5b90439debe6c834fba73a6d4ad3ba8d
Signed-off-by: default avatarKyle Piefer <kpiefer@codeaurora.org>
parent 902b826c

drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

+2 −0
Original line number Diff line number Diff line
@@ -1644,6 +1644,7 @@ static int cam_icp_mgr_release_ctx(struct cam_icp_hw_mgr *hw_mgr, int ctx_id) 
	for (i = 0; i < CAM_FRAME_CMD_MAX; i++)

		clear_bit(i, hw_mgr->ctx_data[ctx_id].hfi_frame_process.bitmap);

	kfree(hw_mgr->ctx_data[ctx_id].hfi_frame_process.bitmap);

	hw_mgr->ctx_data[ctx_id].hfi_frame_process.bitmap = NULL;

	cam_icp_hw_mgr_clk_info_update(hw_mgr, &hw_mgr->ctx_data[ctx_id]);

	hw_mgr->ctx_data[ctx_id].clk_info.curr_fc = 0;

	hw_mgr->ctx_data[ctx_id].clk_info.base_clk = 0;
@@ -2068,6 +2069,7 @@ static int cam_icp_mgr_config_hw(void *hw_mgr_priv, void *config_hw_args) 
	ctx_data = config_args->ctxt_to_hw_map;

	mutex_lock(&ctx_data->ctx_mutex);

	if (!ctx_data->in_use) {

		mutex_unlock(&ctx_data->ctx_mutex);

		CAM_ERR(CAM_ICP, "ctx is not in use");

		return -EINVAL;

	}