Commit dc71bcf1 authored Jan 19, 2013 by Thomas Abraham Committed by Rob Herring Jan 20, 2013

of: fix incorrect return value of of_find_matching_node_and_match()

The of_find_matching_node_and_match() function incorrectly sets the matched
entry to 'matches' when the compatible value of a node matches one of the
possible values. This results in incorrectly selecting the the first entry in
the 'matches' list as the matched entry. Fix this by noting down the result of
the call to of_match_node() and setting that as the matched entry.

Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>

parent 7d1f9aef

drivers/of/base.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -612,6 +612,7 @@ struct device_node of_find_matching_node_and_match(struct device_node from,
		const struct of_device_id **match)
		{
		struct device_node *np;
		const struct of_device_id *m;

		if (match)
		*match = NULL;
		@@ -619,9 +620,10 @@ struct device_node of_find_matching_node_and_match(struct device_node from,
		read_lock(&devtree_lock);
		np = from ? from->allnext : of_allnodes;
		for (; np; np = np->allnext) {
		if (of_match_node(matches, np) && of_node_get(np)) {
		m = of_match_node(matches, np);
		if (m && of_node_get(np)) {
		if (match)
		*match = matches;
		*match = m;
		break;
		}
		}

Admin message