diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-25 15:05:18 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-25 15:05:18 +0200 |
| commit | 35fbd905b05d318573bd86c6abfeda32156b461d (patch) | |
| tree | 8b60be9a3e1618765e5688129ad5fa8bcb417307 /sound/soc/pxa | |
| parent | ASoC: cx20442: Don't ignore regulator_get() errors. (diff) | |
| parent | ARM: pxa: change SSP DMA channels allocation (diff) | |
| download | linux-35fbd905b05d318573bd86c6abfeda32156b461d.tar.xz linux-35fbd905b05d318573bd86c6abfeda32156b461d.zip | |
Merge tag 'pxa-for-4.19-dma_slave_map' of
https://github.com/rjarzmik/linux into asoc-4.19 for ac'97 deps
Diffstat (limited to 'sound/soc/pxa')
| -rw-r--r-- | sound/soc/pxa/pxa-ssp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index 6fc986080130..0b441338bdd4 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -105,9 +105,8 @@ static int pxa_ssp_startup(struct snd_pcm_substream *substream, dma = kzalloc(sizeof(struct snd_dmaengine_dai_dma_data), GFP_KERNEL); if (!dma) return -ENOMEM; - - dma->filter_data = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? - &ssp->drcmr_tx : &ssp->drcmr_rx; + dma->chan_name = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? + "tx" : "rx"; snd_soc_dai_set_dma_data(cpu_dai, substream, dma); |