浏览代码

msm: camera: isp: Handle error check correctly

When validating input/output formats in CSID, if there
is an error, it is being dropped and returned as success.
Handle this to ensure error is propagated from CSID to
HW manager.

CRs-Fixed: 3163468
Change-Id: Ic822feb4ca7418a68ed10ab9a17f72c2408d4759
Signed-off-by: Karthik Anantha Ram <[email protected]>
Karthik Anantha Ram 3 年之前
父节点
当前提交
c270a673d8
共有 1 个文件被更改,包括 8 次插入2 次删除
  1. 8 2
      drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver2.c

+ 8 - 2
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver2.c

@@ -2518,14 +2518,20 @@ int cam_ife_csid_hw_ver2_hw_cfg(
 		return rc;
 	}
 
-	cam_ife_csid_hw_ver2_config_path_data(csid_hw, path_cfg,
+	rc = cam_ife_csid_hw_ver2_config_path_data(csid_hw, path_cfg,
 		reserve, cid);
-	rc = cam_ife_csid_ver_config_camif(csid_hw, reserve, path_cfg);
+	if (rc) {
+		CAM_ERR(CAM_ISP, "CSID[%d] path data config failed",
+			csid_hw->hw_intf->hw_idx);
+		goto end;
+	}
 
+	rc = cam_ife_csid_ver_config_camif(csid_hw, reserve, path_cfg);
 	if (rc)
 		CAM_ERR(CAM_ISP, "CSID[%d] camif config failed",
 			csid_hw->hw_intf->hw_idx);
 
+end:
 	return rc;
 }