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/qcom/apq8016_sbc.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/qcom/apq8016_sbc.c')
| -rw-r--r-- | sound/soc/qcom/apq8016_sbc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/soc/qcom/apq8016_sbc.c b/sound/soc/qcom/apq8016_sbc.c index f60a71990f66..ac75838bbfab 100644 --- a/sound/soc/qcom/apq8016_sbc.c +++ b/sound/soc/qcom/apq8016_sbc.c @@ -150,17 +150,17 @@ static struct apq8016_sbc_data *apq8016_sbc_parse_of(struct snd_soc_card *card) link = data->dai_link; - dlc = devm_kzalloc(dev, 2 * sizeof(*dlc), GFP_KERNEL); - if (!dlc) - return ERR_PTR(-ENOMEM); + for_each_child_of_node(node, np) { + dlc = devm_kzalloc(dev, 2 * sizeof(*dlc), GFP_KERNEL); + if (!dlc) + return ERR_PTR(-ENOMEM); - link->cpus = &dlc[0]; - link->platforms = &dlc[1]; + link->cpus = &dlc[0]; + link->platforms = &dlc[1]; - link->num_cpus = 1; - link->num_platforms = 1; + link->num_cpus = 1; + link->num_platforms = 1; - for_each_child_of_node(node, np) { cpu = of_get_child_by_name(np, "cpu"); codec = of_get_child_by_name(np, "codec"); |