diff options
| author | Mark Brown <broonie@kernel.org> | 2019-07-06 12:25:24 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-07-06 12:25:24 +0100 |
| commit | 0dceaf7c798de953c74073cc77be40b7be49abbc (patch) | |
| tree | 8014fcd5783090ced8024d71d3d943676033af8e /sound/soc/generic | |
| parent | 6fbc7275c7a9ba97877050335f290341a1fd8dbf (diff) | |
| parent | 1bcc1fd64e4dd903f4d868a9e053986e3b102713 (diff) | |
| download | linux-0dceaf7c798de953c74073cc77be40b7be49abbc.tar.bz2 | |
Merge branch 'asoc-5.2' into asoc-linus
Diffstat (limited to 'sound/soc/generic')
| -rw-r--r-- | sound/soc/generic/audio-graph-card.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index ec7e673ba475..70ed28d97d49 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -435,9 +435,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); @@ -457,6 +454,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; |