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

Commit a0ab77b8 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: tfe: Fix variable initialization issues" into camera-kernel.lnx.3.1

parents b355f4f8 1b30be51

drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static int cam_tfe_mgr_handle_reg_dump(struct cam_tfe_hw_mgr_ctx *ctx, 
	struct cam_cmd_buf_desc *reg_dump_buf_desc, uint32_t num_reg_dump_buf,

	uint32_t meta_type)

{

	int rc, i;

	int rc = -EINVAL, i;



	if (!num_reg_dump_buf || !reg_dump_buf_desc) {

		CAM_DBG(CAM_ISP,

drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_core.c

+15 −15
Original line number Diff line number Diff line
@@ -1767,6 +1767,10 @@ static int cam_tfe_csid_release(void *hw_priv, 
		return -EINVAL;

	}



	csid_hw_info = (struct cam_hw_info  *)hw_priv;

	csid_hw = (struct cam_tfe_csid_hw   *)csid_hw_info->core_info;

	res = (struct cam_isp_resource_node *)release_args;



	if (res->res_type != CAM_ISP_RESOURCE_PIX_PATH) {

		CAM_ERR(CAM_ISP, "CSID:%d Invalid res type:%d res id%d",

			csid_hw->hw_intf->hw_idx, res->res_type,
@@ -1774,10 +1778,6 @@ static int cam_tfe_csid_release(void *hw_priv, 
		return -EINVAL;

	}



	csid_hw_info = (struct cam_hw_info  *)hw_priv;

	csid_hw = (struct cam_tfe_csid_hw   *)csid_hw_info->core_info;

	res = (struct cam_isp_resource_node *)release_args;



	mutex_lock(&csid_hw->hw_info->hw_mutex);

	if ((res->res_type == CAM_ISP_RESOURCE_PIX_PATH &&

		res->res_id >= CAM_TFE_CSID_PATH_RES_MAX)) {
@@ -1884,6 +1884,11 @@ static int cam_tfe_csid_init_hw(void *hw_priv, 
		return -EINVAL;

	}



	csid_hw_info = (struct cam_hw_info  *)hw_priv;

	csid_hw = (struct cam_tfe_csid_hw   *)csid_hw_info->core_info;

	res      = (struct cam_isp_resource_node *)init_args;

	csid_reg = csid_hw->csid_info->csid_reg;



	if (res->res_type != CAM_ISP_RESOURCE_PIX_PATH) {

		CAM_ERR(CAM_ISP, "CSID:%d Invalid res type state %d",

			csid_hw->hw_intf->hw_idx,
@@ -1891,11 +1896,6 @@ static int cam_tfe_csid_init_hw(void *hw_priv, 
		return -EINVAL;

	}



	csid_hw_info = (struct cam_hw_info  *)hw_priv;

	csid_hw = (struct cam_tfe_csid_hw   *)csid_hw_info->core_info;

	res      = (struct cam_isp_resource_node *)init_args;

	csid_reg = csid_hw->csid_info->csid_reg;



	mutex_lock(&csid_hw->hw_info->hw_mutex);

	if (res->res_type == CAM_ISP_RESOURCE_PIX_PATH &&

		res->res_id >= CAM_TFE_CSID_PATH_RES_MAX) {
@@ -1958,18 +1958,18 @@ static int cam_tfe_csid_deinit_hw(void *hw_priv, 
		return -EINVAL;

	}



	if (res->res_type == CAM_ISP_RESOURCE_PIX_PATH) {

	CAM_DBG(CAM_ISP, "Enter");

	res = (struct cam_isp_resource_node *)deinit_args;

	csid_hw_info = (struct cam_hw_info  *)hw_priv;

	csid_hw = (struct cam_tfe_csid_hw   *)csid_hw_info->core_info;



	if (res->res_type != CAM_ISP_RESOURCE_PIX_PATH) {

		CAM_ERR(CAM_ISP, "CSID:%d Invalid Res type %d",

			 csid_hw->hw_intf->hw_idx,

			res->res_type);

		return -EINVAL;

	}



	CAM_DBG(CAM_ISP, "Enter");

	res = (struct cam_isp_resource_node *)deinit_args;

	csid_hw_info = (struct cam_hw_info  *)hw_priv;

	csid_hw = (struct cam_tfe_csid_hw   *)csid_hw_info->core_info;



	mutex_lock(&csid_hw->hw_info->hw_mutex);

	if (res->res_state == CAM_ISP_RESOURCE_STATE_RESERVED) {

		CAM_DBG(CAM_ISP, "CSID:%d Res:%d already in De-init state",