فهرست منبع

msm: camera: isp: Fix return conditions in csid

Fix return conditions leading to structurally dead code in csid.

CRs-Fixed: 3306112, 3306117
Change-Id: Id6716f970186756be4c6d879335f2630cecf403c
Signed-off-by: Mukund Madhusudan Atre <[email protected]>
Mukund Madhusudan Atre 2 سال پیش
والد
کامیت
9a76a579d7

+ 3 - 3
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_common.c

@@ -487,13 +487,13 @@ int cam_ife_csid_cid_reserve(struct cam_ife_csid_cid_data *cid_data,
 	}
 
 	if (i == CAM_IFE_CSID_CID_MAX) {
-		for (j = 0; j < reserve->in_port->num_valid_vc_dt; j++) {
+		for (j = 0; j < reserve->in_port->num_valid_vc_dt; j++)
 			CAM_ERR(CAM_ISP,
 				"CSID[%d] reserve fail vc[%d] dt[%d]",
 				hw_idx, reserve->in_port->vc[j],
 				reserve->in_port->dt[j]);
-			return -EINVAL;
-		}
+
+		return -EINVAL;
 	}
 
 	cid_data[i].cid_cnt++;

+ 1 - 1
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver2.c

@@ -4409,7 +4409,7 @@ static int cam_ife_csid_ver2_enable_hw(
 		if (csid_hw->top_info_irq_handle < 1) {
 			CAM_ERR(CAM_ISP, "CSID[%d] Subscribe Top Info Irq fail",
 				csid_hw->hw_intf->hw_idx);
-			return -EINVAL;
+			rc = -EINVAL;
 			goto unsubscribe_top_err;
 		}
 	}