Merge "soc: soundwire: Fix soundwire audio core voting sequence"

This commit is contained in:
qctecmdr 2020-09-03 18:06:23 -07:00 • committed by Gerrit - the friendly Code Review server
commit d22126dbda

View file

@ -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);