Skip to contentSkip to conversation

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

PATCH Applied Wei Yongjun 2 participants 2 messages May 20, 2020 – May 25, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bus: arm-integrator-lm: Fix return value check in integrator_ap_lm_probe()

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")
---
 drivers/bus/arm-integrator-lm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/bus/arm-integrator-lm.c +2 -2
index 669ea7e1f92e..845b6c43fef8 100644
@@ -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)) {
#1 lore raw

Hi Wei,

Quoted 7 lines · Wei Yongjun

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")

I applied this and signed it off and sent it over to the ARM SoC maintainers.

Yours,
Linus Walleij