Commit 38835391 authored Nov 20, 2019 by Saravana Kannan Committed by Greg Kroah-Hartman Nov 21, 2019

of: property: Fix the semantics of of_is_ancestor_of()

The of_is_ancestor_of() function was renamed from of_link_is_valid()
based on review feedback. The rename meant the semantics of the function
had to be inverted, but this was missed in the earlier patch.

So, fix the semantics of of_is_ancestor_of() and invert the conditional
expressions where it is used.

Fixes: a3e1d1a7 ("of: property: Add functional dependency link from DT bindings")
Signed-off-by: Saravana Kannan <saravanak@google.com>
Link: https://lore.kernel.org/r/20191120080230.16007-1-saravanak@google.com

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 60774d2a

drivers/of/property.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -993,11 +993,11 @@ static bool of_is_ancestor_of(struct device_node *test_ancestor,
		while (child) {
		if (child == test_ancestor) {
		of_node_put(child);
		return false;
		return true;
		}
		child = of_get_next_parent(child);
		}
		return true;
		return false;
		}

		/**
		@@ -1043,7 +1043,7 @@ static int of_link_to_phandle(struct device dev, struct device_node sup_np,
		* descendant nodes. By definition, a child node can't be a functional
		* dependency for the parent node.
		*/
		if (!of_is_ancestor_of(dev->of_node, sup_np)) {
		if (of_is_ancestor_of(dev->of_node, sup_np)) {
		dev_dbg(dev, "Not linking to %pOFP - is descendant\n", sup_np);
		of_node_put(sup_np);
		return -EINVAL;