Commit 17c1ffd2 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman

ASoC: qcom: Fix of-node refcount unbalance in apq8016_sbc_parse_of()

[ Upstream commit 8d166720 ]

The apq8016 driver leaves the of-node refcount at aborting from the
loop of for_each_child_of_node() in the error path.  Not only the
iterator node of for_each_child_of_node(), the children nodes referred
from it for codec and cpu have to be properly unreferenced.

Fixes: bdb052e8 ("ASoC: qcom: add apq8016 sound card support")
Cc: Patrick Lai <plai@codeaurora.org>
Cc: Banajit Goswami <bgoswami@codeaurora.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4fe1e6ca
...@@ -164,41 +164,52 @@ static struct apq8016_sbc_data *apq8016_sbc_parse_of(struct snd_soc_card *card) ...@@ -164,41 +164,52 @@ static struct apq8016_sbc_data *apq8016_sbc_parse_of(struct snd_soc_card *card)
if (!cpu || !codec) { if (!cpu || !codec) {
dev_err(dev, "Can't find cpu/codec DT node\n"); dev_err(dev, "Can't find cpu/codec DT node\n");
return ERR_PTR(-EINVAL); ret = -EINVAL;
goto error;
} }
link->cpu_of_node = of_parse_phandle(cpu, "sound-dai", 0); link->cpu_of_node = of_parse_phandle(cpu, "sound-dai", 0);
if (!link->cpu_of_node) { if (!link->cpu_of_node) {
dev_err(card->dev, "error getting cpu phandle\n"); dev_err(card->dev, "error getting cpu phandle\n");
return ERR_PTR(-EINVAL); ret = -EINVAL;
goto error;
} }
ret = snd_soc_of_get_dai_name(cpu, &link->cpu_dai_name); ret = snd_soc_of_get_dai_name(cpu, &link->cpu_dai_name);
if (ret) { if (ret) {
dev_err(card->dev, "error getting cpu dai name\n"); dev_err(card->dev, "error getting cpu dai name\n");
return ERR_PTR(ret); goto error;
} }
ret = snd_soc_of_get_dai_link_codecs(dev, codec, link); ret = snd_soc_of_get_dai_link_codecs(dev, codec, link);
if (ret < 0) { if (ret < 0) {
dev_err(card->dev, "error getting codec dai name\n"); dev_err(card->dev, "error getting codec dai name\n");
return ERR_PTR(ret); goto error;
} }
link->platform_of_node = link->cpu_of_node; link->platform_of_node = link->cpu_of_node;
ret = of_property_read_string(np, "link-name", &link->name); ret = of_property_read_string(np, "link-name", &link->name);
if (ret) { if (ret) {
dev_err(card->dev, "error getting codec dai_link name\n"); dev_err(card->dev, "error getting codec dai_link name\n");
return ERR_PTR(ret); goto error;
} }
link->stream_name = link->name; link->stream_name = link->name;
link->init = apq8016_sbc_dai_init; link->init = apq8016_sbc_dai_init;
link++; link++;
of_node_put(cpu);
of_node_put(codec);
} }
return data; return data;
error:
of_node_put(np);
of_node_put(cpu);
of_node_put(codec);
return ERR_PTR(ret);
} }
static const struct snd_soc_dapm_widget apq8016_sbc_dapm_widgets[] = { static const struct snd_soc_dapm_widget apq8016_sbc_dapm_widgets[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment