Skip to contentSkip to conversation

thermal: armada: fix a test in probe()

PATCH In review Dan Carpenter 2 participants 2 messages Sep 19, 2018

Subsystems (3)
Kernel janitors Thermal Marvell mvebu thermal driver
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 thermal: armada: fix a test in probe()

The platform_get_resource() function doesn't return error pointers, it returns NULL on error.

Fixes 3d4e51844a4e ("thermal: armada: convert driver to syscon register accesses")
Signed-off-by Dan Carpenter <[email protected]>
drivers/thermal/armada_thermal.c +2 -2
index 2c2f6d93034e..92f67d40f2e9 100644
@@ -526,8 +526,8 @@ static int armada_thermal_probe_legacy(struct platform_device *pdev,
 
 	/* First memory region points towards the status register */
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (IS_ERR(res))
-		return PTR_ERR(res);
+	if (!res)
+		return -EIO;
 
 	/*
 	 * Edit the resource start address and length to map over all the
maintainer Reviewed-by on v1 1/1
#1 lore raw

Hi Dan,

Dan Carpenter <[email protected]> wrote on Wed, 19 Sep 2018 13:35:00 +0300:

Quoted 11 lines

The platform_get_resource() function doesn't return error pointers, it returns NULL on error.

Fixes 3d4e51844a4e ("thermal: armada: convert driver to syscon register accesses")
Signed-off-by Dan Carpenter <[email protected]>
drivers/thermal/armada_thermal.c +0 -0
index 2c2f6d93034e..92f67d40f2e9 100644

drivers/thermal/armada_thermal.c static int armada_thermal_probe_legacy(struct platform_device *pdev, · line 533

Quoted 10 lines
drivers/thermal/armada_thermal.c +2 -2
@@ -526,8 +526,8 @@ static int armada_thermal_probe_legacy(struct platform_device *pdev,
 
 	/* First memory region points towards the status register */
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (IS_ERR(res))
-		return PTR_ERR(res);
+	if (!res)
+		return -EIO;
 
 	/*
 	 * Edit the resource start address and length to map over all the
Reviewed-by Miquel Raynal <[email protected]>

Thanks,
Miquèl