From 4bdb9a34c6b2bfa09ba25ce9ed12d3df39cc1efa Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Wed, 29 Oct 2014 16:05:52 +0800 Subject: [PATCH] MLK-9764-4: ASoC: dmaengine: enable audio dma suspend/resume Revert "ENGR00320849-3 ASoC: dmaengine: Audio suspend/resume will be failed." This reverts commit 2e516e0787f9f83003a2fddac2ce1ce51bbdcfcc. According commit 1880fc41df, sdma has fixed the issue in suspend/resume. So enable the audio dma suspend/resume. Signed-off-by: Shengjiu Wang --- sound/soc/soc-dmaengine-pcm.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sound/soc/soc-dmaengine-pcm.c b/sound/soc/soc-dmaengine-pcm.c index f762ac0f9f1c..8d01630c93f7 100644 --- a/sound/soc/soc-dmaengine-pcm.c +++ b/sound/soc/soc-dmaengine-pcm.c @@ -187,20 +187,16 @@ int snd_dmaengine_pcm_trigger(struct snd_pcm_substream *substream, int cmd) switch (cmd) { case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: ret = dmaengine_pcm_prepare_and_submit(substream); if (ret) return ret; dma_async_issue_pending(prtd->dma_chan); break; - case SNDRV_PCM_TRIGGER_RESUME: - case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - dmaengine_resume(prtd->dma_chan); - break; + case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - dmaengine_pause(prtd->dma_chan); - break; - case SNDRV_PCM_TRIGGER_STOP: dmaengine_terminate_all(prtd->dma_chan); break; default: