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

Commit 75cf615b authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mhi: core: check MHI host state instead of MHI dev state for LPM exit state"

parents fae9452a 0c401832

drivers/bus/mhi/controllers/mhi_qcom.c

+7 −0
Original line number Diff line number Diff line
@@ -164,11 +164,18 @@ static int mhi_runtime_suspend(struct device *dev) 
{

	int ret = 0;

	struct mhi_controller *mhi_cntrl = dev_get_drvdata(dev);

	struct mhi_dev *mhi_dev = mhi_controller_get_devdata(mhi_cntrl);



	MHI_LOG("Enter\n");



	mutex_lock(&mhi_cntrl->pm_mutex);



	if (!mhi_dev->powered_on) {

		MHI_LOG("Not fully powered, return success\n");

		mutex_unlock(&mhi_cntrl->pm_mutex);

		return 0;

	}



	ret = mhi_pm_suspend(mhi_cntrl);

	if (ret) {

		MHI_LOG("Abort due to ret:%d\n", ret);

drivers/bus/mhi/core/mhi_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -1042,7 +1042,7 @@ int __mhi_device_get_sync(struct mhi_controller *mhi_cntrl) 
	read_unlock_bh(&mhi_cntrl->pm_lock);



	ret = wait_event_timeout(mhi_cntrl->state_event,

				 mhi_cntrl->dev_state == MHI_STATE_M0 ||

				 mhi_cntrl->pm_state == MHI_PM_M0 ||

				 MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state),

				 msecs_to_jiffies(mhi_cntrl->timeout_ms));