Merge branch 'asoc-5.3' into asoc-5.4

3 files changed, 36 insertions, 27 deletions

diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 30a4e8399ec3..288df245b2f0 100644
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -63,6 +63,7 @@ static int graph_get_dai_id(struct device_node *ep)
         struct device_node *endpoint;
         struct of_endpoint info;
         int i, id;
+        const u32 *reg;
         int ret;
 
         /* use driver specified DAI ID if exist */
@@ -83,8 +84,9 @@ static int graph_get_dai_id(struct device_node *ep)
                         return info.id;
 
                 node = of_get_parent(ep);
+                reg = of_get_property(node, "reg", NULL);
                 of_node_put(node);
-                if (of_get_property(node, "reg", NULL))
+                if (reg)
                         return info.port;
         }
         node = of_graph_get_port_parent(ep);
@@ -208,10 +210,6 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
 
         dev_dbg(dev, "link_of DPCM (%pOF)\n", ep);
 
-        of_node_put(ports);
-        of_node_put(port);
-        of_node_put(node);
-
         if (li->cpu) {
                 int is_single_links = 0;
 
@@ -229,17 +227,17 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
 
                 ret = asoc_simple_parse_cpu(ep, dai_link, &is_single_links);
                 if (ret)
-                        return ret;
+                        goto out_put_node;
 
                 ret = asoc_simple_parse_clk_cpu(dev, ep, dai_link, dai);
                 if (ret < 0)
-                        return ret;
+                        goto out_put_node;
 
                 ret = asoc_simple_set_dailink_name(dev, dai_link,
                                                    "fe.%s",
                                                    cpus->dai_name);
                 if (ret < 0)
-                        return ret;
+                        goto out_put_node;
 
                 /* card->num_links includes Codec */
                 asoc_simple_canonicalize_cpu(dai_link, is_single_links);
@@ -263,17 +261,17 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
 
                 ret = asoc_simple_parse_codec(ep, dai_link);
                 if (ret < 0)
-                        return ret;
+                        goto out_put_node;
 
                 ret = asoc_simple_parse_clk_codec(dev, ep, dai_link, dai);
                 if (ret < 0)
-                        return ret;
+                        goto out_put_node;
 
                 ret = asoc_simple_set_dailink_name(dev, dai_link,
                                                    "be.%s",
                                                    codecs->dai_name);
                 if (ret < 0)
-                        return ret;
+                        goto out_put_node;
 
                 /* check "prefix" from top node */
                 snd_soc_of_parse_node_prefix(top, cconf, codecs->of_node,
@@ -293,19 +291,23 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
 
         ret = asoc_simple_parse_tdm(ep, dai);
         if (ret)
-                return ret;
+                goto out_put_node;
 
         ret = asoc_simple_parse_daifmt(dev, cpu_ep, codec_ep,
                                        NULL, &dai_link->dai_fmt);
         if (ret < 0)
-                return ret;
+                goto out_put_node;
 
         dai_link->dpcm_playback         = 1;
         dai_link->dpcm_capture          = 1;
         dai_link->ops                   = &graph_ops;
         dai_link->init                  = asoc_simple_dai_init;
 
-        return 0;
+out_put_node:
+        of_node_put(ports);
+        of_node_put(port);
+        of_node_put(node);
+        return ret;
 }
 
 static int graph_dai_link_of(struct asoc_simple_priv *priv,
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index ac8678fe55ff..556b1a789629 100644
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -349,6 +349,13 @@ void asoc_simple_canonicalize_platform(struct snd_soc_dai_link *dai_link)
         /* Assumes platform == cpu */
         if (!dai_link->platforms->of_node)
                 dai_link->platforms->of_node = dai_link->cpus->of_node;
+
+        /*
+         * DPCM BE can be no platform.
+         * Alloced memory will be waste, but not leak.
+         */
+        if (!dai_link->platforms->of_node)
+                dai_link->num_platforms = 0;
 }
 EXPORT_SYMBOL_GPL(asoc_simple_canonicalize_platform);
 
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index e5cde0d5e63c..ef849151ba56 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -124,8 +124,6 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
 
         li->link++;
 
-        of_node_put(node);
-
         /* For single DAI link & old style of DT node */
         if (is_top)
                 prefix = PREFIX;
@@ -147,17 +145,17 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
 
                 ret = asoc_simple_parse_cpu(np, dai_link, &is_single_links);
                 if (ret)
-                        return ret;
+                        goto out_put_node;
 
                 ret = asoc_simple_parse_clk_cpu(dev, np, dai_link, dai);
                 if (ret < 0)
-                        return ret;
+                        goto out_put_node;
 
                 ret = asoc_simple_set_dailink_name(dev, dai_link,
                                                    "fe.%s",
                                                    cpus->dai_name);
                 if (ret < 0)
-                        return ret;
+                        goto out_put_node;
 
                 asoc_simple_canonicalize_cpu(dai_link, is_single_links);
         } else {
@@ -180,17 +178,17 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
 
                 ret = asoc_simple_parse_codec(np, dai_link);
                 if (ret < 0)
-                        return ret;
+                        goto out_put_node;
 
                 ret = asoc_simple_parse_clk_codec(dev, np, dai_link, dai);
                 if (ret < 0)
-                        return ret;
+                        goto out_put_node;
 
                 ret = asoc_simple_set_dailink_name(dev, dai_link,
                                                    "be.%s",
                                                    codecs->dai_name);
                 if (ret < 0)
-                        return ret;
+                        goto out_put_node;
 
                 /* check "prefix" from top node */
                 snd_soc_of_parse_node_prefix(top, cconf, codecs->of_node,
@@ -208,19 +206,21 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
 
         ret = asoc_simple_parse_tdm(np, dai);
         if (ret)
-                return ret;
+                goto out_put_node;
 
         ret = asoc_simple_parse_daifmt(dev, node, codec,
                                        prefix, &dai_link->dai_fmt);
         if (ret < 0)
-                return ret;
+                goto out_put_node;
 
         dai_link->dpcm_playback         = 1;
         dai_link->dpcm_capture          = 1;
         dai_link->ops                   = &simple_ops;
         dai_link->init                  = asoc_simple_dai_init;
 
-        return 0;
+out_put_node:
+        of_node_put(node);
+        return ret;
 }
 
 static int simple_dai_link_of(struct asoc_simple_priv *priv,
@@ -364,8 +364,6 @@ static int simple_for_each_link(struct asoc_simple_priv *priv,
                         goto error;
                 }
 
-                of_node_put(codec);
-
                 /* get convert-xxx property */
                 memset(&adata, 0, sizeof(adata));
                 for_each_child_of_node(node, np)
@@ -387,11 +385,13 @@ static int simple_for_each_link(struct asoc_simple_priv *priv,
                                 ret = func_noml(priv, np, codec, li, is_top);
 
                         if (ret < 0) {
+                                of_node_put(codec);
                                 of_node_put(np);
                                 goto error;
                         }
                 }
 
+                of_node_put(codec);
                 node = of_get_next_child(top, node);
         } while (!is_top && node);