Skip to contentSkip to conversation

Patch "of: fix reference counting in of_graph_get_endpoint_by_regs" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Sep 5, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

of: fix reference counting in of_graph_get_endpoint_by_regs

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
of-fix-reference-counting-in-of_graph_get_endpoint_by_regs.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 34276bb062b8449b3b0a208c9b848a1a27920075 Mon Sep 17 00:00:00 2001

From: Lucas Stach <[email protected]>
Date: Mon, 15 Aug 2016 14:58:43 +0200
Subject: of: fix reference counting in of_graph_get_endpoint_by_regs

From: Lucas Stach <[email protected]>

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)

---
 drivers/of/base.c |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/of/base.c +2 -9
@@ -2253,20 +2253,13 @@ struct device_node *of_graph_get_endpoin
 	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;

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/of-fix-reference-counting-in-of_graph_get_endpoint_by_regs.patch