diff options
author | Mark Brown <broonie@kernel.org> | 2020-03-27 18:29:20 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-03-27 18:29:20 +0100 |
commit | 1c521d7e62262793789845989edca57dea24eb7d (patch) | |
tree | dd891362188494b9d665229696ffb72187998a00 /sound/soc/atmel/atmel-pcm-dma.c | |
parent | Merge branch 'asoc-5.6' into asoc-linus (diff) | |
parent | Merge series "ASoC: Intel: add SoundWire machine driver" from Pierre-Louis Bo... (diff) | |
download | linux-1c521d7e62262793789845989edca57dea24eb7d.tar.xz linux-1c521d7e62262793789845989edca57dea24eb7d.zip |
Merge branch 'asoc-5.7' into asoc-next
Diffstat (limited to 'sound/soc/atmel/atmel-pcm-dma.c')
-rw-r--r-- | sound/soc/atmel/atmel-pcm-dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/atmel/atmel-pcm-dma.c b/sound/soc/atmel/atmel-pcm-dma.c index db67f5ba1e9a..cb03c4f7324c 100644 --- a/sound/soc/atmel/atmel-pcm-dma.c +++ b/sound/soc/atmel/atmel-pcm-dma.c @@ -56,7 +56,7 @@ static void atmel_pcm_dma_irq(u32 ssc_sr, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct atmel_pcm_dma_params *prtd; - prtd = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); + prtd = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); if (ssc_sr & prtd->mask->ssc_error) { if (snd_pcm_running(substream)) @@ -83,7 +83,7 @@ static int atmel_pcm_configure_dma(struct snd_pcm_substream *substream, struct ssc_device *ssc; int ret; - prtd = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); + prtd = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream); ssc = prtd->ssc; ret = snd_hwparams_to_dma_slave_config(substream, params, slave_config); |