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

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

Merge "msm: camera: cdm: Avoid cdm pause incase of BL submit" into camera-kernel.lnx.3.1

parents 1bf95277 08d329c5

drivers/cam_cdm/cam_cdm_hw_core.c

+3 −3
Original line number Diff line number Diff line
@@ -1344,6 +1344,9 @@ 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);



	/* First pause CDM, If it fails still proceed to dump debug info */

	cam_hw_cdm_enable_core(cdm_hw, false);



	rc = cam_cdm_read_hw_reg(cdm_hw,

			cdm_core->offsets->cmn_reg->current_bl_len,

			&current_bl_data);
@@ -1455,9 +1458,6 @@ int cam_hw_cdm_handle_error( 


	cdm_core = (struct cam_cdm *)cdm_hw->core_info;



	/* First pause CDM, If it fails still proceed to dump debug info */

	cam_hw_cdm_enable_core(cdm_hw, false);



	rc = cam_hw_cdm_handle_error_info(cdm_hw, handle);



	return rc;