DORMANTno replies LANDED

Landed in mainline as 97a2f40e3801 on 2020-05-25.

[PATCH] bus: arm-integrator-lm: Fix return value check in integrator_ap_lm_probe()

From: Linus Walleij <hidden>
Date: 2020-05-25 09:19:36
Subsystem: arm integrator, versatile and realview support, the rest · Maintainers: Linus Walleij, Linus Torvalds

From: Wei Yongjun <redacted>

In case of error, the function of_find_matching_node() returns NULL
pointer not ERR_PTR(). The IS_ERR() test in the return value check
should be replaced with NULL test.

Fixes: ccea5e8a5918 ("bus: Add driver for Integrator/AP logic modules")
Reported-by: Hulk Robot <redacted>
Signed-off-by: Wei Yongjun <redacted>
Link: https://lore.kernel.org/r/20200520032150.165388-1-weiyongjun1@huawei.com (local)
Signed-off-by: Linus Walleij <redacted>
---
Hi SoC guys, please apply this patch directly for v5.8
wherever the other Versatile stuff was applied, thanks!
---
 drivers/bus/arm-integrator-lm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/bus/arm-integrator-lm.c b/drivers/bus/arm-integrator-lm.c
index 669ea7e1f92e..845b6c43fef8 100644
--- a/drivers/bus/arm-integrator-lm.c
+++ b/drivers/bus/arm-integrator-lm.c
@@ -78,10 +78,10 @@ static int integrator_ap_lm_probe(struct platform_device *pdev)
 
 	/* Look up the system controller */
 	syscon = of_find_matching_node(NULL, integrator_ap_syscon_match);
-	if (IS_ERR(syscon)) {
+	if (!syscon) {
 		dev_err(dev,
 			"could not find Integrator/AP system controller\n");
-		return PTR_ERR(syscon);
+		return -ENODEV;
 	}
 	map = syscon_node_to_regmap(syscon);
 	if (IS_ERR(map)) {
-- 
2.25.4


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help