Merge tag 'defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / drivers / base / property.c

diff --git a/drivers/base/property.c b/drivers/base/property.c
index d0874f6..453918e 100644 (file)
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -1033,7 +1033,26 @@ struct fwnode_handle *
 fwnode_graph_get_next_endpoint(const struct fwnode_handle *fwnode,
                               struct fwnode_handle *prev)
 {
-       return fwnode_call_ptr_op(fwnode, graph_get_next_endpoint, prev);
+       const struct fwnode_handle *parent;
+       struct fwnode_handle *ep;
+
+       /*
+        * If this function is in a loop and the previous iteration returned
+        * an endpoint from fwnode->secondary, then we need to use the secondary
+        * as parent rather than @fwnode.
+        */
+       if (prev)
+               parent = fwnode_graph_get_port_parent(prev);
+       else
+               parent = fwnode;
+
+       ep = fwnode_call_ptr_op(parent, graph_get_next_endpoint, prev);
+
+       if (IS_ERR_OR_NULL(ep) &&
+           !IS_ERR_OR_NULL(parent) && !IS_ERR_OR_NULL(parent->secondary))
+               ep = fwnode_graph_get_next_endpoint(parent->secondary, NULL);
+
+       return ep;
 }
 EXPORT_SYMBOL_GPL(fwnode_graph_get_next_endpoint);
 
@@ -1212,14 +1231,7 @@ fwnode_graph_get_endpoint_by_id(const struct fwnode_handle *fwnode,
                best_ep_id = fwnode_ep.id;
        }
 
-       if (best_ep)
-               return best_ep;
-
-       if (fwnode && !IS_ERR_OR_NULL(fwnode->secondary))
-               return fwnode_graph_get_endpoint_by_id(fwnode->secondary, port,
-                                                      endpoint, flags);
-
-       return NULL;
+       return best_ep;
 }
 EXPORT_SYMBOL_GPL(fwnode_graph_get_endpoint_by_id);