[PATCH v3] firmware: qcom: scm: Fix incorrect of_node_put calls in scm_init

Loys Ollivier lollivier at baylibre.com
Fri Dec 15 05:40:14 PST 2017


When using other platform architectures, in the init of the qcom_scm
driver, of_node_put is called on /firmware if no qcom dt is found.
This results in a kernel error: Bad of_node_put() on /firmware.

These calls to of_node_put from the qcom_scm init are unnecessary as
of_find_matching_node and of_platform_populate are calling it
automatically.

Remove the calls to of_node_put() on fw_np.

Fixes: d0f6fa7ba2d6 ("firmware: qcom: scm: Convert SCM to platform driver")
Suggested-by: Stephen Boyd <sboyd at codeaurora.org>
Signed-off-by: Loys Ollivier <lollivier at baylibre.com>
---
 drivers/firmware/qcom_scm.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
index af4c75217ea6..f6d7b7cffe0c 100644
--- a/drivers/firmware/qcom_scm.c
+++ b/drivers/firmware/qcom_scm.c
@@ -632,17 +632,13 @@ static int __init qcom_scm_init(void)
 
 	np = of_find_matching_node(fw_np, qcom_scm_dt_match);
 
-	if (!np) {
-		of_node_put(fw_np);
+	if (!np)
 		return -ENODEV;
-	}
 
 	of_node_put(np);
 
 	ret = of_platform_populate(fw_np, qcom_scm_dt_match, NULL, NULL);
 
-	of_node_put(fw_np);
-
 	if (ret)
 		return ret;
 
-- 
2.7.4




More information about the linux-arm-kernel mailing list