浏览代码

msm: camera: isp: Fix some known kw issues

This change fixes below kw issues:

1. Operands in a bitwise operation have different size.
2. err_evt_info might be used uninitialized.

CRs-Fixed: 3491937
Change-Id: Ied038b18c72485646dc641f6d1396d15c50c06e2
Signed-off-by: Stark Lin <[email protected]>
Stark Lin 2 年之前
父节点
当前提交
444b5dc204

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

@@ -5807,12 +5807,13 @@ static uint64_t __cam_ife_csid_ver2_get_time_stamp(void __iomem *mem_base,
 	uint32_t timestamp0_addr, uint32_t timestamp1_addr,
 	bool ts_comb_vcdt_en, uint32_t ts_comb_vcdt_mask)
 {
-	uint64_t timestamp_val, time_hi, time_lo;
+	uint64_t timestamp_val, time_hi, time_lo, mask;
 
 	time_hi = cam_io_r_mb(mem_base + timestamp1_addr);
 	time_lo = cam_io_r_mb(mem_base + timestamp0_addr);
+	mask = (uint64_t)ts_comb_vcdt_mask;
 	if (ts_comb_vcdt_en)
-		time_lo &= ~ts_comb_vcdt_mask;
+		time_lo &= ~mask;
 
 	timestamp_val = (time_hi << 32) | time_lo;
 

+ 3 - 0
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c

@@ -2836,6 +2836,9 @@ static int cam_vfe_bus_ver3_err_irq_bottom_half(
 		bus_priv->common_data.core_index, evt_payload->image_size_violation_status,
 		evt_payload->ccif_violation_status);
 
+	memset(&evt_info, 0, sizeof(evt_info));
+	memset(&err_evt_info, 0, sizeof(err_evt_info));
+
 	if (image_size_violation || constraint_violation) {
 		status = evt_payload->image_size_violation_status;
 		if (!status)