summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-08-20 22:31:10 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2021-08-20 22:31:10 +0300
commit43a6473e4713004fbe755a062c2d37c9bde05c2e (patch)
treef2632ee1859db1a140b9ddf24c3036cdbec5d259 /sound/soc
parent54e9ea3cdb13884b8d3a0c13b9b92bab4a1c96f5 (diff)
parent65ca89c2b12cca0d473f3dd54267568ad3af55cc (diff)
downloadlinux-43a6473e4713004fbe755a062c2d37c9bde05c2e.tar.xz
Merge tag 'sound-5.14-rc7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull more sound fixes from Takashi Iwai: "This is a quick follow up for 5.14: a fix for a very recently introduced regression on ASoC Intel Atom driver, and another trivial HD-audio quirk for HP laptops" * tag 'sound-5.14-rc7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ASoC: intel: atom: Fix breakage for PCM buffer address setup ALSA: hda/realtek: Limit mic boost on HP ProBook 445 G8
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/intel/atom/sst-mfld-platform-pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
index 5db2f4865bbb..905c7965f653 100644
--- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c
+++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
@@ -127,7 +127,7 @@ static void sst_fill_alloc_params(struct snd_pcm_substream *substream,
snd_pcm_uframes_t period_size;
ssize_t periodbytes;
ssize_t buffer_bytes = snd_pcm_lib_buffer_bytes(substream);
- u32 buffer_addr = substream->runtime->dma_addr;
+ u32 buffer_addr = virt_to_phys(substream->runtime->dma_area);
channels = substream->runtime->channels;
period_size = substream->runtime->period_size;