Merge "mhi: core: fix error handling in time synchronization function" (ac699e7b) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/bus/mhi/core/mhi_main.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -2536,13 +2536,13 @@ int mhi_get_remote_time_sync(struct mhi_device *mhi_dev,
		/* not all devices support time feature */
		if (!mhi_tsync) {
		ret = -EIO;
		goto err_unlock;
		goto error_unlock;
		}

		/* bring to M0 state */
		ret = __mhi_device_get_sync(mhi_cntrl);
		if (ret)
		goto err_unlock;
		goto error_unlock;

		read_lock_bh(&mhi_cntrl->pm_lock);
		if (unlikely(MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state))) {
		@@ -2555,8 +2555,10 @@ int mhi_get_remote_time_sync(struct mhi_device *mhi_dev,

		/* disable link level low power modes */
		ret = mhi_cntrl->lpm_disable(mhi_cntrl, mhi_cntrl->priv_data);
		if (ret)
		if (ret) {
		read_lock_bh(&mhi_cntrl->pm_lock);
		goto error_invalid_state;
		}

		/*
		* time critical code to fetch device times,
		@@ -2578,7 +2580,7 @@ int mhi_get_remote_time_sync(struct mhi_device *mhi_dev,
		error_invalid_state:
		mhi_cntrl->wake_put(mhi_cntrl, false);
		read_unlock_bh(&mhi_cntrl->pm_lock);
		err_unlock:
		error_unlock:
		mutex_unlock(&mhi_cntrl->tsync_mutex);
		return ret;
		}