diff options
| author |   Saravana Kannan <saravanak@google.com> | 2019-11-20 00:02:29 -0800 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-21 13:01:15 +0100 |
| commit | 3883539140b8ce67ad000938c3cd3b3e59498520 (patch) | |
| tree | 777bb75c18012169015acd735cdd96fa3ba4d473 /drivers/of | |
| parent | i2c: of: Populate fwnode in of_i2c_get_board_info() (diff) | |
| download | linux-dev-3883539140b8ce67ad000938c3cd3b3e59498520.tar.xz linux-dev-3883539140b8ce67ad000938c3cd3b3e59498520.zip | |
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: a3e1d1a7f5fc ("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>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/property.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/of/property.c b/drivers/of/property.c index 0fa04692e3cc..3c75dd2f7c02 100644 --- a/drivers/of/property.c +++ b/drivers/of/property.c @@ -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; |