Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaa80005 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman
Browse files

ASoC: fsl: Fix of-node refcount unbalance in fsl_ssi_probe_from_dt() 



commit 2757970f6d0d0a112247600b23d38c0c728ceeb3 upstream.

The node obtained from of_find_node_by_path() has to be unreferenced
after the use, but we forgot it for the root node.

Fixes: f0fba2ad ("ASoC: multi-component - ASoC Multi-Component Support")
Cc: Timur Tabi <timur@kernel.org>
Cc: Nicolin Chen <nicoleotsuka@gmail.com>
Cc: Xiubo Li <Xiubo.Lee@gmail.com>
Cc: Fabio Estevam <festevam@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Acked-by: default avatarNicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6fff954a

sound/soc/fsl/fsl_ssi.c

+4 −1
Original line number Diff line number Diff line
@@ -1418,6 +1418,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) 
	struct fsl_ssi_private *ssi_private;

	int ret = 0;

	struct device_node *np = pdev->dev.of_node;

	struct device_node *root;

	const struct of_device_id *of_id;

	const char *p, *sprop;

	const uint32_t *iprop;
@@ -1605,7 +1606,9 @@ static int fsl_ssi_probe(struct platform_device *pdev) 
	 * device tree.  We also pass the address of the CPU DAI driver

	 * structure.

	 */

	sprop = of_get_property(of_find_node_by_path("/"), "compatible", NULL);

	root = of_find_node_by_path("/");

	sprop = of_get_property(root, "compatible", NULL);

	of_node_put(root);

	/* Sometimes the compatible name has a "fsl," prefix, so we strip it. */

	p = strrchr(sprop, ',');

	if (p)