Merge "soc: soundwire: Fix soundwire audio core voting sequence" (d22126db) · Commits · e / devices / android_kernel_fairphone_FP5

soc/swr-mstr-ctrl.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -3243,16 +3243,19 @@ static int swrm_runtime_suspend(struct device *dev)
		swrm->ipc_wakeup_triggered = false;
		}
		}

		}
		if (swrm_request_hw_vote(swrm, LPASS_AUDIO_CORE, false))
		dev_dbg(dev, "%s:lpass audio hw enable failed\n",
		__func__);

		/* Retain SSR state until resume */
		if (current_state != SWR_MSTR_SSR)
		swrm->state = SWR_MSTR_DOWN;

		exit:
		if (current_state != SWR_MSTR_UP) {
		if (swrm_request_hw_vote(swrm, LPASS_AUDIO_CORE, false))
		dev_dbg(dev, "%s:lpass audio hw enable failed\n",
		__func__);
		}

		if (!hw_core_err)
		swrm_request_hw_vote(swrm, LPASS_HW_CORE, false);
		mutex_unlock(&swrm->reslock);