Merge remote-tracking branches 'asoc/topic/mtk', 'asoc/topic/mxs', 'asoc/topic/nau882...

[muen/linux.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 d3497a3e14ca82778ed47f1dc412715439c0b90a..2f7c8cf6f123f5c2a8c4fcee7f76e21fd0b473e0 100644 (file)
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -224,9 +224,11 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv)
 
        of_for_each_phandle(&it, rc, node, "dais", NULL, 0) {
                ret = asoc_graph_card_dai_link_of(it.node, priv, idx++);
 
        of_for_each_phandle(&it, rc, node, "dais", NULL, 0) {
                ret = asoc_graph_card_dai_link_of(it.node, priv, idx++);

-               of_node_put(it.node);
-               if (ret < 0)
+               if (ret < 0) {
+                       of_node_put(it.node);
+

                        return ret;
                        return ret;

+               }

        }
 
        return asoc_simple_card_parse_card_name(card, NULL);
        }
 
        return asoc_simple_card_parse_card_name(card, NULL);


@@ -239,10 +241,8 @@ static int asoc_graph_get_dais_count(struct device *dev)
        int count = 0;
        int rc;
 
        int count = 0;
        int rc;
 

-       of_for_each_phandle(&it, rc, node, "dais", NULL, 0) {
+       of_for_each_phandle(&it, rc, node, "dais", NULL, 0)

                count++;
                count++;

-               of_node_put(it.node);
-       }

 
        return count;
 }
 
        return count;
 }