Merge "Revert "ASoC: soc-pcm: BE dai needs prepare when pause release after resume""

This commit is contained in:
qctecmdr 2020-05-15 20:31:11 -07:00 • committed by Gerrit - the friendly Code Review server
commit 1c8201b865

View file

@ -2673,11 +2673,16 @@ int dpcm_be_dai_prepare(struct snd_soc_pcm_runtime *fe, int stream)
/* is this op for this BE ? */
if (!snd_soc_dpcm_be_can_update(fe, be, stream))
continue;
#ifdef CONFIG_AUDIO_QGKI
if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_HW_PARAMS) &&
(be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP) &&
(be->dpcm[stream].state != SND_SOC_DPCM_STATE_SUSPEND))
#else
if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_HW_PARAMS) &&
(be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP) &&
(be->dpcm[stream].state != SND_SOC_DPCM_STATE_SUSPEND) &&
(be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED))
#endif
continue;
dev_dbg(be->dev, "ASoC: prepare BE %s\n",