shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 12:57:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ASoC: rockchip: trcm: Fix sleeping function called in atomic context"

Browse Source 
This reverts commit bc09999632.

Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: I70d059c9719125a0b4202bd88da6e8be00fb32c9
This commit is contained in:
Wu Liangqing
2024-01-30 17:55:27 +08:00
committed by Tao Huang
parent 5de6448b26
commit 6ed72fc616
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/rockchip/rockchip_trcm.c
View File

@@ -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: