A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 13:49:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: camera: isp: Change data type for error handling" into camera-kernel.lnx.4.0

Browse source
This commit is contained in:
Camera Software Integration 2020-02-04 15:17:06 -08:00 • committed by Gerrit - the friendly Code Review server
commit 77b739919d
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,
&csid_reset_args,
sizeof(struct cam_csid_reset_cfg_args));
if (rc <= 0)
if (rc)
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)
{
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;
@ -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 +
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: