Merge "msm: camera: icp: Move the log after ctx validation" into dev/msm-4.14-camx (ec43f060) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -1464,10 +1464,6 @@ static int cam_icp_mgr_handle_frame_process(uint32_t *msg_ptr, int flag)
		CAM_ERR(CAM_ICP, "Invalid Context");
		return -EINVAL;
		}
		CAM_DBG(CAM_REQ,
		"ctx_id : %u, request_id :%lld dev_type: %d",
		ctx_data->ctx_id, request_id,
		ctx_data->icp_dev_acquire_info->dev_type);

		mutex_lock(&ctx_data->ctx_mutex);
		cam_icp_ctx_timer_reset(ctx_data);
		@@ -1478,6 +1474,11 @@ static int cam_icp_mgr_handle_frame_process(uint32_t *msg_ptr, int flag)
		return 0;
		}

		CAM_DBG(CAM_REQ,
		"ctx_id : %u, request_id :%lld dev_type: %d",
		ctx_data->ctx_id, request_id,
		ctx_data->icp_dev_acquire_info->dev_type);

		clk_type = ICP_DEV_TYPE_TO_CLK_TYPE(
		ctx_data->icp_dev_acquire_info->dev_type);
		cam_icp_device_timer_reset(&icp_hw_mgr, clk_type);