diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-20 11:50:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-20 11:50:41 +0000 |
| commit | 31824e6554a4f96a9830fc9d4a15de8a6539857a (patch) | |
| tree | 982b652835fba225f7154092484ffa3af3ab3c6c /sound/soc | |
| parent | 4cfa1a385fc57999180eb6720ee2487f549f4e03 (diff) | |
| parent | ec4f2857cd41b7c5af6350e7ab2a8fe1874dae59 (diff) | |
| download | op-kernel-dev-31824e6554a4f96a9830fc9d4a15de8a6539857a.zip op-kernel-dev-31824e6554a4f96a9830fc9d4a15de8a6539857a.tar.gz | |
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/soc-generic-dmaengine-pcm.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index 560a778..5bace12 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -176,17 +176,20 @@ static struct dma_chan *dmaengine_pcm_compat_request_channel( { struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform); 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); if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) && 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 snd_dmaengine_pcm_request_channel(pcm->config->compat_filter_fn, - dma_data->filter_data); + if (pcm->config) + 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) |
