diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2016-08-15 14:58:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-07 08:32:41 +0200 |
| commit | 51ed10c4ffd7742d160c02f7dd6bab634b2c03ef (patch) | |
| tree | dbfa0f13f038d36f31dd8e7ba1a0cf281b34d457 /drivers/of | |
| parent | df4fe6f8c7b793adcab7b423a6efd989e195b4b3 (diff) | |
of: fix reference counting in of_graph_get_endpoint_by_regs
commit 34276bb062b8449b3b0a208c9b848a1a27920075 upstream.
The called of_graph_get_next_endpoint() already decrements the refcount
of the prev node, so it is wrong to do it again in the calling function.
Use the for_each_endpoint_of_node() helper to interate through the
endpoint OF nodes, which already does the right thing and simplifies
the code a bit.
Fixes: 8ccd0d0ca041
(of: add helper for getting endpoint node of specific identifiers)
Reported-by: David Jander <david@protonic.nl>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/base.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 942461f36616..31341290cd91 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2253,20 +2253,13 @@ struct device_node *of_graph_get_endpoint_by_regs( const struct device_node *parent, int port_reg, int reg) { struct of_endpoint endpoint; - struct device_node *node, *prev_node = NULL; - - while (1) { - node = of_graph_get_next_endpoint(parent, prev_node); - of_node_put(prev_node); - if (!node) - break; + struct device_node *node = NULL; + for_each_endpoint_of_node(parent, node) { of_graph_parse_endpoint(node, &endpoint); if (((port_reg == -1) || (endpoint.port == port_reg)) && ((reg == -1) || (endpoint.id == reg))) return node; - - prev_node = node; } return NULL; |