[v2,2/3] ASoC: soc-core: fix unbalanced of_node_get()/of_node_put()

Commit Message

Antonio Borneo July 27, 2017, 11:26 p.m. UTC

From: Antonio Borneo <[e-mail]>

On Hikey target board, enabling CONFIG_OF_DYNAMIC triggers several
errors at kernel boot, like the following one
OF: ERROR: Bad of_node_put() on /soc/i2s@f7118000/ports/port@0/endpoint
each followed by stack dump.

of_graph_get_port_parent() walks through the parents looking for a
node named "ports". At each step it uses of_get_next_parent() that
drops the current node with of_node_put().
Avoid dropping the initial node by calling of_node_get() before
of_graph_get_port_parent().

Tested with kernel v4.13-rc2 with hikey_defconfig taken from
https://git.linaro.org/people/john.stultz/android-dev.git
branch dev/hikey-mainline-WIP

This fixes commit a180e8b98843 ("ASoC: add snd_soc_get_dai_id()
function").

Signed-off-by: Antonio Borneo <[e-mail]>
---
To: Liam Girdwood <[e-mail]>
To: Mark Brown <[e-mail]>
To: Jaroslav Kysela <[e-mail]>
To: Takashi Iwai <[e-mail]>
To: [e-mail]
Cc: [e-mail]
Cc: Wei Xu <[e-mail]>
Cc: John Stultz <[e-mail]>
Cc: [e-mail]
Cc: Kuninori Morimoto <[e-mail]>
---
 sound/soc/soc-core.c | 5 +++++
 1 file changed, 5 insertions(+)

Patch

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 921622a..a0f39de 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -4087,6 +4087,11 @@  int snd_soc_get_dai_id(struct device_node *ep)
 	struct device_node *node;
 	int ret;
 
+	/*
+	 * of_graph_get_port_parent() will call
+	 * of_node_put(). So, call of_node_get() here
+	 */
+	of_node_get(ep);
 	node = of_graph_get_port_parent(ep);
 
 	/*