From 8fcc66faf4a7f37b7f9f63fb37066eccc5300faf Mon Sep 17 00:00:00 2001 From: Alok Chauhan Date: Tue, 24 Nov 2020 16:34:52 +0530 Subject: [PATCH] msm: camera: cdm: Added cdm power state check There is chance that handle error info get scheduled after cdm deinit. As clock and regulator gets disabled as part of deinit so this can cause issue for cdm hw interaction as part of handle error. Added cdm power state check before dumping CDM HW status at the time of error. CRs-Fixed: 2833653 Change-Id: I4bf01ce3900196909cf66ffdb24607c50ab03295 Signed-off-by: Alok Chauhan --- drivers/cam_cdm/cam_cdm_hw_core.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/cam_cdm/cam_cdm_hw_core.c b/drivers/cam_cdm/cam_cdm_hw_core.c index d1db45011049..cfa6684175ae 100644 --- a/drivers/cam_cdm/cam_cdm_hw_core.c +++ b/drivers/cam_cdm/cam_cdm_hw_core.c @@ -1647,6 +1647,11 @@ int cam_hw_cdm_handle_error_info( set_bit(CAM_CDM_RESET_HW_STATUS, &cdm_core->cdm_status); set_bit(CAM_CDM_FLUSH_HW_STATUS, &cdm_core->cdm_status); + if (cdm_hw->hw_state == CAM_HW_STATE_POWER_DOWN) { + CAM_WARN(CAM_CDM, "CDM is in power down state"); + goto end; + } + /* First pause CDM, If it fails still proceed to dump debug info */ cam_hw_cdm_pause_core(cdm_hw, true);