Browse Source

Merge "msm: camera: isp: Reinit completion before issuing path reset" into camera-kernel.lnx.5.0

Haritha Chintalapati 4 năm trước cách đây
mục cha
commit
b92699ea3a

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

@@ -647,15 +647,14 @@ static int cam_ife_csid_path_reset(
 	val = cam_io_r_mb(soc_info->reg_map[0].mem_base +
 		path_reg->irq_mask_addr);
 	val |= 1 << csid_reg->cmn_reg->rst_done_shift_val;
+	irq_reg = cam_ife_csid_convert_res_to_irq_reg(res->res_id);
+	reinit_completion(&csid_hw->irq_complete[irq_reg]);
 
 	cam_io_w_mb(val, soc_info->reg_map[0].mem_base +
 		path_reg->irq_mask_addr);
 	cam_io_w_mb(csid_reg->cmn_reg->path_rst_stb_all,
 		soc_info->reg_map[0].mem_base + path_reg->rst_strobes_addr);
 
-	irq_reg = cam_ife_csid_convert_res_to_irq_reg(res->res_id);
-	reinit_completion(&csid_hw->irq_complete[irq_reg]);
-
 	rem_jiffies = cam_common_wait_for_completion_timeout(
 			&csid_hw->irq_complete[irq_reg],
 			msecs_to_jiffies(IFE_CSID_TIMEOUT));