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

Commit 04c94900 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Greg Kroah-Hartman
Browse files

coresight: of_get_coresight_platform_data: Add missing of_node_put 



The of_get_coresight_platform_data iterates over the possible CPU nodes
to find a given cpu phandle. However it does not drop the reference
to the node pointer returned by the of_get_coresight_platform_data.

This patch also introduces another minor fix is to use
of_cpu_device_node_get() to replace of_get_cpu_node().

Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
[Leo: minor tweaks for of_get_coresight_platform_data]
Signed-off-by: default avatarLeo Yan <leo.yan@linaro.org>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2fd95d65

drivers/hwtracing/coresight/of_coresight.c

+10 −7
Original line number Diff line number Diff line
@@ -109,7 +109,8 @@ of_get_coresight_platform_data(struct device *dev, 
	struct coresight_platform_data *pdata;

	struct of_endpoint endpoint, rendpoint;

	struct device *rdev;

	struct device_node *dn;

	bool found;

	struct device_node *dn, *np;

	struct device_node *ep = NULL;

	struct device_node *rparent = NULL;

	struct device_node *rport = NULL;
@@ -176,17 +177,19 @@ of_get_coresight_platform_data(struct device *dev, 
		} while (ep);

	}



	/* Affinity defaults to CPU0 */

	pdata->cpu = 0;

	dn = of_parse_phandle(node, "cpu", 0);

	for (cpu = 0; dn && cpu < nr_cpu_ids; cpu++) {

		if (dn == of_get_cpu_node(cpu, NULL)) {

			pdata->cpu = cpu;

	for_each_possible_cpu(cpu) {

		np = of_cpu_device_node_get(cpu);

		found = (dn == np);

		of_node_put(np);

		if (found)

			break;

	}

	}

	of_node_put(dn);



	/* Affinity to CPU0 if no cpu nodes are found */

	pdata->cpu = found ? cpu : 0;



	return pdata;

}

EXPORT_SYMBOL_GPL(of_get_coresight_platform_data);