samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Karthik Anantha Ram <kartanan@codeaurora.org>
This commit is contained in:
Karthik Anantha Ram
2020-01-09 12:18:17 -08:00
committed by Gerrit - the friendly Code Review server
parent b08e2b4099
commit 287b7b22d7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
View File

@@ -249,7 +249,7 @@ static int cam_ife_hw_mgr_reset_csid_res(
rc = hw_intf->hw_ops.reset(hw_intf->hw_priv, rc = hw_intf->hw_ops.reset(hw_intf->hw_priv,
&csid_reset_args, &csid_reset_args,
sizeof(struct cam_csid_reset_cfg_args)); sizeof(struct cam_csid_reset_cfg_args));
if (rc <= 0) if (rc)
goto err; goto err;
} }
} }

8
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c
View File

@@ -529,6 +529,7 @@ static int cam_ife_csid_path_reset(struct cam_ife_csid_hw *csid_hw,
struct cam_csid_reset_cfg_args *reset) struct cam_csid_reset_cfg_args *reset)
{ {
int rc = 0; int rc = 0;
unsigned long rem_jiffies;
struct cam_hw_soc_info *soc_info; struct cam_hw_soc_info *soc_info;
struct cam_isp_resource_node *res; struct cam_isp_resource_node *res;
const struct cam_ife_csid_reg_offset *csid_reg; const struct cam_ife_csid_reg_offset *csid_reg;
@@ -648,14 +649,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 + cam_io_w_mb(reset_strb_val, soc_info->reg_map[0].mem_base +
reset_strb_addr); reset_strb_addr);
rc = wait_for_completion_timeout(complete, rem_jiffies = wait_for_completion_timeout(complete,
msecs_to_jiffies(IFE_CSID_TIMEOUT)); 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", CAM_ERR(CAM_ISP, "CSID:%d Res id %d fail rc = %d",
csid_hw->hw_intf->hw_idx, csid_hw->hw_intf->hw_idx,
res->res_id, rc); res->res_id, rc);
if (rc == 0)
rc = -ETIMEDOUT;
} }
end: end: