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

Commit 20692275 authored by Junzhe Zou's avatar Junzhe Zou
Browse files

msm: camera: lrme: set the HW state regardless of stop result 



Set the HW state to power down regardless of the result of disable
SOC resource, in order to prevent second stop on the same HW.

Change-Id: Id23094f9b75271911f8150fffb0a315de9089e5a
Signed-off-by: default avatarJunzhe Zou <jnzhezou@codeaurora.org>
parent 9f766890

drivers/media/platform/msm/camera/cam_lrme/lrme_hw_mgr/lrme_hw/cam_lrme_hw_core.c

+5 −6
Original line number Diff line number Diff line
@@ -855,7 +855,8 @@ int cam_lrme_hw_stop(void *hw_priv, void *hw_stop_args, uint32_t arg_size) 


	mutex_lock(&lrme_hw->hw_mutex);



	if (lrme_hw->open_count == 0) {

	if (lrme_hw->open_count == 0 ||

		lrme_hw->hw_state == CAM_HW_STATE_POWER_DOWN) {

		mutex_unlock(&lrme_hw->hw_mutex);

		CAM_ERR(CAM_LRME, "Error Unbalanced stop");

		return -EINVAL;
@@ -884,10 +885,8 @@ int cam_lrme_hw_stop(void *hw_priv, void *hw_stop_args, uint32_t arg_size) 
	}



	rc = cam_lrme_soc_disable_resources(lrme_hw);

	if (rc) {

	if (rc)

		CAM_ERR(CAM_LRME, "Failed in Disable SOC, rc=%d", rc);

		goto unlock;

	}



	lrme_hw->hw_state = CAM_HW_STATE_POWER_DOWN;

	if (lrme_core->state == CAM_LRME_CORE_STATE_IDLE) {
@@ -1049,9 +1048,9 @@ int cam_lrme_hw_flush(void *hw_priv, void *hw_flush_args, uint32_t arg_size) 


	if (lrme_core->state != CAM_LRME_CORE_STATE_PROCESSING &&

		lrme_core->state != CAM_LRME_CORE_STATE_REQ_PENDING &&

		lrme_core->state == CAM_LRME_CORE_STATE_REQ_PROC_PEND) {

		lrme_core->state != CAM_LRME_CORE_STATE_REQ_PROC_PEND) {

		mutex_unlock(&lrme_hw->hw_mutex);

		CAM_DBG(CAM_LRME, "Stop not needed in %d state",

		CAM_DBG(CAM_LRME, "Flush is not needed in %d state",

			lrme_core->state);

		return 0;

	}