From 6ed72fc61674ce1218548d8ebc8bc31f9b60660b Mon Sep 17 00:00:00 2001 From: Wu Liangqing Date: Tue, 30 Jan 2024 17:55:27 +0800 Subject: [PATCH] Revert "ASoC: rockchip: trcm: Fix sleeping function called in atomic context" This reverts commit bc09999632a46932534b6f9d3273bf727c5724b8. Signed-off-by: Wu Liangqing Change-Id: I70d059c9719125a0b4202bd88da6e8be00fb32c9 --- sound/soc/rockchip/rockchip_trcm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/rockchip/rockchip_trcm.c b/sound/soc/rockchip/rockchip_trcm.c index 79be9419a3f3..8865ccdeaeb0 100644 --- a/sound/soc/rockchip/rockchip_trcm.c +++ b/sound/soc/rockchip/rockchip_trcm.c @@ -272,7 +272,7 @@ int dmaengine_trcm_dma_guard_ctrl(struct snd_soc_component *component, return 0; if (!en) - return dmaengine_terminate_async(chan); + return dmaengine_terminate_sync(chan); direction = stream ? DMA_DEV_TO_MEM : DMA_MEM_TO_DEV; @@ -304,7 +304,7 @@ static int dmaengine_trcm_trigger(struct snd_soc_component *component, switch (cmd) { case SNDRV_PCM_TRIGGER_START: - dmaengine_terminate_async(prtd->dma_chan); + dmaengine_terminate_sync(prtd->dma_chan); ret = dmaengine_trcm_prepare_and_submit(substream); if (ret) return ret; @@ -318,13 +318,13 @@ static int dmaengine_trcm_trigger(struct snd_soc_component *component, if (runtime->info & SNDRV_PCM_INFO_PAUSE) dmaengine_pause(prtd->dma_chan); else - dmaengine_terminate_async(prtd->dma_chan); + dmaengine_terminate_sync(prtd->dma_chan); break; case SNDRV_PCM_TRIGGER_PAUSE_PUSH: dmaengine_pause(prtd->dma_chan); break; case SNDRV_PCM_TRIGGER_STOP: - dmaengine_terminate_async(prtd->dma_chan); + dmaengine_terminate_sync(prtd->dma_chan); dmaengine_trcm_dma_guard_ctrl(component, substream->stream, 1); break; default: