Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8070c34 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: CSID Tasklet stop sequence" into camera-kernel.lnx.4.0

parents 8d5da81f 56b34863

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c

+2 −1
Original line number Diff line number Diff line
@@ -1589,12 +1589,13 @@ static int cam_ife_csid_disable_hw(struct cam_ife_csid_hw *csid_hw) 
	cam_io_w_mb(0, soc_info->reg_map[0].mem_base +

		csid_reg->cmn_reg->csid_top_irq_mask_addr);



	cam_tasklet_stop(csid_hw->tasklet);



	rc = cam_ife_csid_disable_soc_resources(soc_info);

	if (rc)

		CAM_ERR(CAM_ISP, "CSID:%d Disable CSID SOC failed",

			csid_hw->hw_intf->hw_idx);



	cam_tasklet_stop(csid_hw->tasklet);

	spin_lock_irqsave(&csid_hw->lock_state, flags);

	csid_hw->device_enabled = 0;

	spin_unlock_irqrestore(&csid_hw->lock_state, flags);

drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_core.c

+2 −1
Original line number Diff line number Diff line
@@ -1165,12 +1165,13 @@ static int cam_tfe_csid_disable_hw(struct cam_tfe_csid_hw *csid_hw) 
	cam_io_w_mb(0, soc_info->reg_map[0].mem_base +

		csid_reg->cmn_reg->csid_top_irq_mask_addr);



	cam_tasklet_stop(csid_hw->tasklet);



	rc = cam_tfe_csid_disable_soc_resources(soc_info);

	if (rc)

		CAM_ERR(CAM_ISP, "CSID:%d Disable CSID SOC failed",

			csid_hw->hw_intf->hw_idx);



	cam_tasklet_stop(csid_hw->tasklet);

	spin_lock_irqsave(&csid_hw->spin_lock, flags);

	csid_hw->device_enabled = 0;

	spin_unlock_irqrestore(&csid_hw->spin_lock, flags);