hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/topic/dma' into asoc-next

This commit is contained in:
Mark Brown 2014-01-20 11:50:41 +00:00
parent 4cfa1a385f ec4f2857cd
commit 31824e6554
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/soc-generic-dmaengine-pcm.c
View File

@ -176,17 +176,20 @@ static struct dma_chan *dmaengine_pcm_compat_request_channel(
{ {
struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform); struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform);
struct snd_dmaengine_dai_dma_data *dma_data; struct snd_dmaengine_dai_dma_data *dma_data;
dma_filter_fn fn = NULL;
dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) && pcm->chan[0]) if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) && pcm->chan[0])
return pcm->chan[0]; return pcm->chan[0];
if (pcm->config->compat_request_channel) if (pcm->config && pcm->config->compat_request_channel)
return pcm->config->compat_request_channel(rtd, substream); return pcm->config->compat_request_channel(rtd, substream);
return snd_dmaengine_pcm_request_channel(pcm->config->compat_filter_fn, if (pcm->config)
dma_data->filter_data); fn = pcm->config->compat_filter_fn;
return snd_dmaengine_pcm_request_channel(fn, dma_data->filter_data);
} }
static bool dmaengine_pcm_can_report_residue(struct dma_chan *chan) static bool dmaengine_pcm_can_report_residue(struct dma_chan *chan)