diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2018-07-16 11:17:40 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2018-07-16 11:17:40 +0200 |
| commit | 2fb166e50e2f1cbf07cbfa1385a7b4bc922813db (patch) | |
| tree | b92429a16a61af22be1456a39ba72ec6beb4083a /sound | |
| parent | 9d3cce1e8b8561fed5f383d22a4d6949db4eadbe (diff) | |
| parent | 399c4129eba6145924ab90363352b7bdcd554751 (diff) | |
| download | linux-2fb166e50e2f1cbf07cbfa1385a7b4bc922813db.tar.bz2 | |
Merge branch 'next_pxa_dma' into next
Diffstat (limited to 'sound')
| -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); |