Unverified Commit de74ec71 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: simple-card-utils: Don't use __free(device_node) at graph_util_parse_dai() 



commit 419d1918 ("ASoC: simple-card-utils: use __free(device_node) for
device node") uses __free(device_node) for dlc->of_node, but we need to
keep it while driver is in use.

Don't use __free(device_node) in graph_util_parse_dai().

Fixes: 419d1918 ("ASoC: simple-card-utils: use __free(device_node) for device node")
Reported-by: default avatarThuan Nguyen <thuan.nguyen-hong@banvien.com.vn>
Reported-by: default avatarDetlev Casanova <detlev.casanova@collabora.com>
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarThuan Nguyen <thuan.nguyen-hong@banvien.com.vn>
Tested-by: default avatarDetlev Casanova <detlev.casanova@collabora.com>
Link: https://patch.msgid.link/87eczisyhh.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 658fb7fe

sound/soc/generic/simple-card-utils.c

+5 −2
Original line number Diff line number Diff line
@@ -1077,6 +1077,7 @@ static int graph_get_dai_id(struct device_node *ep) 
int graph_util_parse_dai(struct device *dev, struct device_node *ep,

			 struct snd_soc_dai_link_component *dlc, int *is_single_link)

{

	struct device_node *node;

	struct of_phandle_args args = {};

	struct snd_soc_dai *dai;

	int ret;
@@ -1084,7 +1085,7 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep, 
	if (!ep)

		return 0;



	struct device_node *node __free(device_node) = of_graph_get_port_parent(ep);

	node = of_graph_get_port_parent(ep);



	/*

	 * Try to find from DAI node
@@ -1126,8 +1127,10 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep, 
	 *    if he unbinded CPU or Codec.

	 */

	ret = snd_soc_get_dlc(&args, dlc);

	if (ret < 0)

	if (ret < 0) {

		of_node_put(node);

		return ret;

	}



parse_dai_end:

	if (is_single_link)