openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next

This commit is contained in:
Mark Brown 2016-01-11 13:54:30 +00:00
parent 804c0a9569 3f80978397
commit 2dd49f8e6f
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sound/soc/soc-pcm.c
View File

@ -599,10 +599,15 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
out: out:
mutex_unlock(&rtd->pcm_mutex); mutex_unlock(&rtd->pcm_mutex);
pm_runtime_put(platform->dev); pm_runtime_mark_last_busy(platform->dev);
for (i = 0; i < rtd->num_codecs; i++) pm_runtime_put_autosuspend(platform->dev);
pm_runtime_put(rtd->codec_dais[i]->dev); for (i = 0; i < rtd->num_codecs; i++) {
pm_runtime_put(cpu_dai->dev); pm_runtime_mark_last_busy(rtd->codec_dais[i]->dev);
pm_runtime_put_autosuspend(rtd->codec_dais[i]->dev);
}
pm_runtime_mark_last_busy(cpu_dai->dev);
pm_runtime_put_autosuspend(cpu_dai->dev);
for (i = 0; i < rtd->num_codecs; i++) { for (i = 0; i < rtd->num_codecs; i++) {
if (!rtd->codec_dais[i]->active) if (!rtd->codec_dais[i]->active)
pinctrl_pm_select_sleep_state(rtd->codec_dais[i]->dev); pinctrl_pm_select_sleep_state(rtd->codec_dais[i]->dev);
@ -706,10 +711,17 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
mutex_unlock(&rtd->pcm_mutex); mutex_unlock(&rtd->pcm_mutex);
pm_runtime_put(platform->dev); pm_runtime_mark_last_busy(platform->dev);
for (i = 0; i < rtd->num_codecs; i++) pm_runtime_put_autosuspend(platform->dev);
pm_runtime_put(rtd->codec_dais[i]->dev);
pm_runtime_put(cpu_dai->dev); for (i = 0; i < rtd->num_codecs; i++) {
pm_runtime_mark_last_busy(rtd->codec_dais[i]->dev);
pm_runtime_put_autosuspend(rtd->codec_dais[i]->dev);
}
pm_runtime_mark_last_busy(cpu_dai->dev);
pm_runtime_put_autosuspend(cpu_dai->dev);
for (i = 0; i < rtd->num_codecs; i++) { for (i = 0; i < rtd->num_codecs; i++) {
if (!rtd->codec_dais[i]->active) if (!rtd->codec_dais[i]->active)
pinctrl_pm_select_sleep_state(rtd->codec_dais[i]->dev); pinctrl_pm_select_sleep_state(rtd->codec_dais[i]->dev);