ソースを参照

msm: camera: isp: Fix unmatched size issue for bitwise operation

This change fixes a known issue:
Operands in a bitwise operation have different size.

CRs-Fixed: 3523401
Change-Id: Ic7ef67a5bc5413c137fee7693efb2d7ad53ceb50
Signed-off-by: Stark Lin <[email protected]>
Stark Lin 2 年 前
コミット
d7e26e68c3

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

@@ -117,12 +117,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;