diff options
| author | Mark Brown <broonie@kernel.org> | 2019-07-26 14:10:09 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-07-26 14:10:09 +0200 |
| commit | 3b46a67af2eb8214a634a37c485146ca0ef42849 (patch) | |
| tree | 1fef31dfdf401819f71158ad28ba87e7c8c4d886 /sound/soc/qcom | |
| parent | ASoC: codec2codec: deal with params when necessary (diff) | |
| parent | ASoC: ti: davinci-mcasp: Correct slot_width posed constraint (diff) | |
| download | linux-3b46a67af2eb8214a634a37c485146ca0ef42849.tar.xz linux-3b46a67af2eb8214a634a37c485146ca0ef42849.zip | |
Merge branch 'asoc-5.3' into asoc-5.4
Diffstat (limited to 'sound/soc/qcom')
| -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"); |