diff options
author | Takashi Iwai | 2019-08-06 12:28:08 +0200 |
---|---|---|
committer | Takashi Iwai | 2019-08-06 12:28:08 +0200 |
commit | c2913b140f901a705809f8b6c83998cf8147f848 (patch) | |
tree | 53686878548921b83e8d9db437c4437140561980 /sound/soc/generic/simple-card-utils.c | |
parent | ALSA: usb-audio: Fix gpf in snd_usb_pipe_sanity_check (diff) | |
parent | ASoC: amd: acp3x: use dma address for acp3x dma driver (diff) | |
download | kernel-qcow2-linux-c2913b140f901a705809f8b6c83998cf8147f848.tar.gz kernel-qcow2-linux-c2913b140f901a705809f8b6c83998cf8147f848.tar.xz kernel-qcow2-linux-c2913b140f901a705809f8b6c83998cf8147f848.zip |
Merge tag 'asoc-fix-v5.3-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.3
A relatively large batch of mostly unremarkable fixes here, a couple of
small core fixes for fairly obscure issues, more comment/email updates
with no code impact than usual and a bunch of small driver fixes.
The support for new sample rates in the max98373 driver is a fix for the
fact that the driver declared support for those rates but would in fact
return an error if these rates were selected.
Diffstat (limited to 'sound/soc/generic/simple-card-utils.c')
-rw-r--r-- | sound/soc/generic/simple-card-utils.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index ac8678fe55ff..556b1a789629 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -349,6 +349,13 @@ void asoc_simple_canonicalize_platform(struct snd_soc_dai_link *dai_link) /* Assumes platform == cpu */ if (!dai_link->platforms->of_node) dai_link->platforms->of_node = dai_link->cpus->of_node; + + /* + * DPCM BE can be no platform. + * Alloced memory will be waste, but not leak. + */ + if (!dai_link->platforms->of_node) + dai_link->num_platforms = 0; } EXPORT_SYMBOL_GPL(asoc_simple_canonicalize_platform); |