ASoC: qcom: Fix of-node refcount unbalance to link->codec_of_node
authorNobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
Thu, 6 Feb 2020 03:36:11 +0000 (12:36 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 Feb 2020 21:30:58 +0000 (16:30 -0500)
[ This is a fix specific to 4.4.y and 4.9.y stable trees;
  4.14.y and older are not affected ]

The of-node refcount fixes were made in commit 8d1667200850 ("ASoC: qcom:
Fix of-node refcount unbalance in apq8016_sbc_parse_of()"), but not enough
in 4.4.y and 4.9.y. The modification of link->codec_of_node is missing.
This fixes of-node refcount unbalance to link->codec_of_node.

Fixes: 8d1667200850 ("ASoC: qcom: Fix of-node refcount unbalance in apq8016_sbc_parse_of()")
Cc: Patrick Lai <plai@codeaurora.org>
Cc: Banajit Goswami <bgoswami@codeaurora.org>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Mark Brown <broonie@kernel.org>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/qcom/apq8016_sbc.c

index 754742018515a409814c73ad3f55f3b8beddb33e..3d91cef3704a579773f502a1fde645208be4a6f7 100644 (file)
@@ -128,7 +128,8 @@ static struct apq8016_sbc_data *apq8016_sbc_parse_of(struct snd_soc_card *card)
                link->codec_of_node = of_parse_phandle(codec, "sound-dai", 0);
                if (!link->codec_of_node) {
                        dev_err(card->dev, "error getting codec phandle\n");
-                       return ERR_PTR(-EINVAL);
+                       ret = -EINVAL;
+                       goto error;
                }
 
                ret = snd_soc_of_get_dai_name(cpu, &link->cpu_dai_name);