Merge tag 'asoc-fix-v5.3-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-rpi.git] / sound / soc / generic / audio-graph-card.c

diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index ebf2ca3..288df24 100644 (file)
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -423,9 +423,6 @@ static int graph_for_each_link(struct asoc_simple_priv *priv,
                        codec_ep = of_graph_get_remote_endpoint(cpu_ep);
                        codec_port = of_get_parent(codec_ep);
 
-                       of_node_put(codec_ep);
-                       of_node_put(codec_port);
-
                        /* get convert-xxx property */
                        memset(&adata, 0, sizeof(adata));
                        graph_parse_convert(dev, codec_ep, &adata);
@@ -445,6 +442,9 @@ static int graph_for_each_link(struct asoc_simple_priv *priv,
                        else
                                ret = func_noml(priv, cpu_ep, codec_ep, li);
 
+                       of_node_put(codec_ep);
+                       of_node_put(codec_port);
+
                        if (ret < 0)
                                return ret;