Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c8201b8 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 47f0c1c2 409f3e56

sound/soc/soc-pcm.c

+6 −1
Original line number Diff line number Diff line
@@ -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",