Skip to contentSkip to conversation

Patch "soc: qcom: smsm: fix child-node lookup" has been added to the 4.15-stable tree

PATCH [email protected] 1 participant 1 message Mar 22, 2018

Subsystems (3)
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

soc: qcom: smsm: fix child-node lookup

to the 4.15-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:
soc-qcom-smsm-fix-child-node-lookup.patch
and it can be found in the queue-4.15 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 foo@baz Thu Mar 22 14:03:40 CET 2018

From: Johan Hovold <[email protected]>
Date: Wed, 15 Nov 2017 12:07:24 +0100
Subject: soc: qcom: smsm: fix child-node lookup

From: Johan Hovold <[email protected]>

[ Upstream commit 8804517e9fc16c10081ff5e42e7d80704973a8e2 ]

Fix child-node lookup during probe, which ended up searching the whole device tree depth-first starting at the parent rather than just matching on its children.

Note that the original premature free of the parent node has already been fixed separately.

Also note that this pattern of looking up the first child node with a given property is rare enough that a generic helper is probably not warranted.

Fixes c97c4090ff72 ("soc: qcom: smsm: Add driver for Qualcomm SMSM")
Fixes 3e8b55411468 ("soc: qcom: smsm: fix of_node refcnting problem")
Cc Bjorn Andersson <[email protected]>
Cc Rob Clark <[email protected]>
---
 drivers/soc/qcom/smsm.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/soc/qcom/smsm.c +4 -2
@@ -496,8 +496,10 @@ static int qcom_smsm_probe(struct platfo
 	if (!smsm->hosts)
 		return -ENOMEM;
 
-	local_node = of_find_node_with_property(of_node_get(pdev->dev.of_node),
-						"#qcom,smem-state-cells");
+	for_each_child_of_node(pdev->dev.of_node, local_node) {
+		if (of_find_property(local_node, "#qcom,smem-state-cells", NULL))
+			break;
+	}
 	if (!local_node) {
 		dev_err(&pdev->dev, "no state entry\n");
 		return -EINVAL;

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

queue-4.15/soc-qcom-smsm-fix-child-node-lookup.patch