summaryrefslogtreecommitdiffstats
path: root/sound/soc/atmel/mchp-pdmc.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2022-05-08 10:49:25 +0200
committerTakashi Iwai <tiwai@suse.de>2022-05-08 10:49:25 +0200
commitac02e3cd5ab9407dcf926df2a1085c13881ccf7a (patch)
tree81e76b1568bf3455bd19c9abd0f2cae487f1ba1c /sound/soc/atmel/mchp-pdmc.c
parenteb9d84b0ffe39893cb23b0b6712bbe3637fa25fa (diff)
parentc61711c1c95791850be48dd65a1d72eb34ba719f (diff)
downloadlinux-stable-ac02e3cd5ab9407dcf926df2a1085c13881ccf7a.tar.gz
linux-stable-ac02e3cd5ab9407dcf926df2a1085c13881ccf7a.tar.bz2
linux-stable-ac02e3cd5ab9407dcf926df2a1085c13881ccf7a.zip
Merge tag 'asoc-fix-v5.18-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.18 A larger collection of fixes than I'd like, mainly because mixer-test is making it's way into the CI systems and turning up issues on a wider range of systems. The most substantial thing though is a revert and an alternative fix for a dmaengine issue where the fix caused disruption for some other configurations, the core fix is backed out an a driver specific thing done instead.
Diffstat (limited to 'sound/soc/atmel/mchp-pdmc.c')
-rw-r--r--sound/soc/atmel/mchp-pdmc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/atmel/mchp-pdmc.c b/sound/soc/atmel/mchp-pdmc.c
index 1a7802fbf23c..a3856c73e221 100644
--- a/sound/soc/atmel/mchp-pdmc.c
+++ b/sound/soc/atmel/mchp-pdmc.c
@@ -966,6 +966,7 @@ static int mchp_pdmc_process(struct snd_pcm_substream *substream,
static struct snd_dmaengine_pcm_config mchp_pdmc_config = {
.process = mchp_pdmc_process,
+ .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config,
};
static int mchp_pdmc_probe(struct platform_device *pdev)