diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-08-06 17:00:51 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-08-06 17:00:51 +0200 |
| commit | 56e7a93160fe12a7ccce0c2191c64a6db9cb3ad9 (patch) | |
| tree | 3c1d838f353b6819efdc0f84770f2f07092a517c /sound/soc/xilinx/xlnx_formatter_pcm.c | |
| parent | 97367c97226aab8b298ada954ce12659ee3ad2a4 (diff) | |
| parent | e5ada3f6787a4d6234adc6f2f3ae35c6d5b71ba0 (diff) | |
| download | linux-56e7a93160fe12a7ccce0c2191c64a6db9cb3ad9.tar.gz | |
Merge tag 'asoc-fix-v5.14-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.14
Quite a lot of fixes here, the biggest set being for the cs42l42 driver
which is reasonably old but has seen a sudden uptick in activity.
There's also some fixes for correctly referencing PCM buffer addresses
and the removal of some driver-local bodges that had been done for the
lack of prefix handling in DAPM which were broken by the core handling
that as expected.
Diffstat (limited to 'sound/soc/xilinx/xlnx_formatter_pcm.c')
| -rw-r--r-- | sound/soc/xilinx/xlnx_formatter_pcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/xilinx/xlnx_formatter_pcm.c b/sound/soc/xilinx/xlnx_formatter_pcm.c index 1d59fb668c77..91afea9d5de6 100644 --- a/sound/soc/xilinx/xlnx_formatter_pcm.c +++ b/sound/soc/xilinx/xlnx_formatter_pcm.c @@ -452,8 +452,8 @@ static int xlnx_formatter_pcm_hw_params(struct snd_soc_component *component, stream_data->buffer_size = size; - low = lower_32_bits(substream->dma_buffer.addr); - high = upper_32_bits(substream->dma_buffer.addr); + low = lower_32_bits(runtime->dma_addr); + high = upper_32_bits(runtime->dma_addr); writel(low, stream_data->mmio + XLNX_AUD_BUFF_ADDR_LSB); writel(high, stream_data->mmio + XLNX_AUD_BUFF_ADDR_MSB); |