Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 062aed89 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: msm_bus: skip visited endpoint nodes"

parents d6a7f6be 9b4fc4c9
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@
			"system_noc-base", "ipa_virt-base";

		mbox-names = "apps_rsc";
		mboxes = <&apps_rsc 0>;

		/*RSCs*/
		rsc_apps: rsc-apps {
+9 −4
Original line number Diff line number Diff line
/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.
/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 and
@@ -433,18 +433,23 @@ static int getpath(struct device *src_dev, int dest, const char *cl_name)

			for (i = 0; i < bus_node->node_info->num_connections;
									i++) {
				bool skip;
				bool skip = false;
				struct msm_bus_node_device_type
						*node_conn;
				node_conn =
				to_msm_bus_node(
				bus_node->node_info->dev_connections[i]);
				if (node_conn->node_info->is_traversed) {
				if (node_conn->node_info->is_traversed &&
				    node_conn->node_info->num_connections) {
					MSM_BUS_ERR("Circ Path %d\n",
					node_conn->node_info->id);
					goto reset_traversed;
				}
				skip = chk_bl_list(&black_list,
				if (node_conn->node_info->is_traversed &&
				    !node_conn->node_info->num_connections)
					skip = true;

				skip |= chk_bl_list(&black_list,
					bus_node->node_info->connections[i]);
				if (!skip) {
					list_add_tail(&node_conn->link,