summaryrefslogtreecommitdiff
path: root/sound/x86/intel_hdmi_audio.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2022-03-05 11:28:31 +0300
committerTakashi Iwai <tiwai@suse.de>2022-03-05 11:29:00 +0300
commitd460975eeea80a4ef9a089ee6e413f72fb742316 (patch)
tree94f26d184a67668d1439c35232b1d9e40b11123a /sound/x86/intel_hdmi_audio.c
parentd7f15befac809ba365742464e1b0bebf07149c58 (diff)
parentcd94df1795418056a19ff4cb44eadfc18ac99a57 (diff)
downloadlinux-d460975eeea80a4ef9a089ee6e413f72fb742316.tar.xz
Merge branch 'for-linus' into for-next
Back-merge of 5.17-devel branch for further work on Intel LPE HDMI stuff Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/x86/intel_hdmi_audio.c')
-rw-r--r--sound/x86/intel_hdmi_audio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c
index 1c94eaff1931..4a3ff6468aa7 100644
--- a/sound/x86/intel_hdmi_audio.c
+++ b/sound/x86/intel_hdmi_audio.c
@@ -1261,7 +1261,7 @@ static int had_pcm_mmap(struct snd_pcm_substream *substream,
{
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
return remap_pfn_range(vma, vma->vm_start,
- substream->dma_buffer.addr >> PAGE_SHIFT,
+ substream->runtime->dma_addr >> PAGE_SHIFT,
vma->vm_end - vma->vm_start, vma->vm_page_prot);
}