ASoC: simple-card: fixup refcount_t underflow

morimoto · broonie · commit 19dd0777773a · 2019-02-18T18:36:52.000Z
commit da21535 ("ASoC: simple-card: merge simple-scu-card") merged simple-card and simple-scu-card. Then it had refcount underflow bug. This patch fixup it. We will get below error without this patch. OF: ERROR: Bad of_node_put() on /sound CPU: 3 PID: 237 Comm: kworker/3:1 Not tainted 5.0.0-rc6+ #1514 Hardware name: Renesas H3ULCB Kingfisher board based on r8a7795 ES2.0+ (DT) Workqueue: events deferred_probe_work_func Call trace: dump_backtrace+0x0/0x150 show_stack+0x24/0x30 dump_stack+0xb0/0xec of_node_release+0xd0/0xd8 kobject_put+0x74/0xe8 of_node_put+0x24/0x30 __of_get_next_child+0x50/0x70 of_get_next_child+0x40/0x68 asoc_simple_card_probe+0x604/0x730 platform_drv_probe+0x58/0xa8 ... Reported-by: Vicente Bergas <vicencb@gmail.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
@@ -462,7 +462,7 @@ static int asoc_simple_card_parse_of(struct simple_card_data *priv)
 	conf_idx	= 0;
 	node = of_get_child_by_name(top, PREFIX "dai-link");
 	if (!node) {
-		node = dev->of_node;
+		node = of_node_get(top);
 		loop = 0;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,7 @@ static int asoc_simple_card_parse_of(struct simple_card_data *priv)`
`462`	`462`	`conf_idx = 0;`
`463`	`463`	`node = of_get_child_by_name(top, PREFIX "dai-link");`
`464`	`464`	`if (!node) {`
`465`		`- node = dev->of_node;`
	`465`	`+ node = of_node_get(top);`
`466`	`466`	`loop = 0;`
`467`	`467`	`}`
`468`	`468`