From 409f3e56bb83aec02ca23555a96e7f695a7402c6 Mon Sep 17 00:00:00 2001 From: Laxminath Kasam Date: Thu, 5 Sep 2019 10:21:12 +0530 Subject: [PATCH] Revert "ASoC: soc-pcm: BE dai needs prepare when pause release after resume" This reverts commit 3c3dd68c48e83aca55dc72a33260a71608510160. In QC platforms, backend is not teardown during pause state. Backend prepare is not needed when resume from pause state. Change-Id: Ia9f8ab36f5061f9909d9026271bac4a2f6d3e79b Signed-off-by: Laxminath Kasam --- sound/soc/soc-pcm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index bdbb175c84c7..24d61d8e7cc4 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -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",