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

Commit e8010f6c authored by Karthik Anantha Ram's avatar Karthik Anantha Ram Committed by Gerrit - the friendly Code Review server
Browse files

msm: camera: isp: Change data type for error handling 



Use unsigned long to capture the return value of
wait_for_completion APIs as part of CSID path reset.

CRs-Fixed: 2600604
Change-Id: Ic21ddf283180a177b2c2d9e9a33fec4ec68bdd98
Signed-off-by: default avatarKarthik Anantha Ram <kartanan@codeaurora.org>
parent 4bb6a941

drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static int cam_ife_hw_mgr_reset_csid_res( 
			rc = hw_intf->hw_ops.reset(hw_intf->hw_priv,

				&csid_reset_args,

				sizeof(struct cam_csid_reset_cfg_args));

			if (rc <= 0)

			if (rc)

				goto err;

		}

	}

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c

+4 −4
Original line number Diff line number Diff line
@@ -527,6 +527,7 @@ static int cam_ife_csid_path_reset(struct cam_ife_csid_hw *csid_hw, 
	struct cam_csid_reset_cfg_args  *reset)

{

	int rc = 0;

	unsigned long rem_jiffies;

	struct cam_hw_soc_info                    *soc_info;

	struct cam_isp_resource_node              *res;

	const struct cam_ife_csid_reg_offset      *csid_reg;
@@ -646,14 +647,13 @@ static int cam_ife_csid_path_reset(struct cam_ife_csid_hw *csid_hw, 
	cam_io_w_mb(reset_strb_val, soc_info->reg_map[0].mem_base +

				reset_strb_addr);



	rc = wait_for_completion_timeout(complete,

	rem_jiffies = wait_for_completion_timeout(complete,

		msecs_to_jiffies(IFE_CSID_TIMEOUT));

	if (rc <= 0) {

	if (!rem_jiffies) {

		rc = -ETIMEDOUT;

		CAM_ERR(CAM_ISP, "CSID:%d Res id %d fail rc = %d",

			 csid_hw->hw_intf->hw_idx,

			res->res_id,  rc);

		if (rc == 0)

			rc = -ETIMEDOUT;

	}



end: