Skip to contentSkip to conversation

irqchip/irq-mvebu-sei: Fix a NULL vs IS_ERR() bug in probe

PATCH In review Dan Carpenter 3 participants 3 messages Oct 13, 2018 – Nov 1, 2018

Subsystems (3)
Kernel janitors irqchip drivers Arm/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SoC support
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 irqchip/irq-mvebu-sei: Fix a NULL vs IS_ERR() bug in probe

The devm_ioremap_resource() function never returns NULL, it returns error pointers.

Fixes 61ce8d8d8a81 ("irqchip/irq-mvebu-sei: Add new driver for Marvell SEI")
Signed-off-by Dan Carpenter <[email protected]>
---
 drivers/irqchip/irq-mvebu-sei.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/irqchip/irq-mvebu-sei.c +2 -2
index 566d69a2edbc..add4c9c934c8 100644
@@ -384,9 +384,9 @@ static int mvebu_sei_probe(struct platform_device *pdev)
 
 	sei->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	sei->base = devm_ioremap_resource(sei->dev, sei->res);
-	if (!sei->base) {
+	if (IS_ERR(sei->base)) {
 		dev_err(sei->dev, "Failed to remap SEI resource\n");
-		return -ENODEV;
+		return PTR_ERR(sei->base);
 	}
 
 	/* Retrieve the SEI capabilities with the interrupt ranges */
Signature · 1 line
2.18.0
Reviewed-by on v1 1/1
#1 lore raw

Hi Dan,

Dan Carpenter <[email protected]> wrote on Sat, 13 Oct 2018 13:22:46 +0300:

Quoted 15 lines

The devm_ioremap_resource() function never returns NULL, it returns error pointers.

Fixes 61ce8d8d8a81 ("irqchip/irq-mvebu-sei: Add new driver for Marvell SEI")
Signed-off-by Dan Carpenter <[email protected]>
---
 drivers/irqchip/irq-mvebu-sei.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/irqchip/irq-mvebu-sei.c +0 -0
index 566d69a2edbc..add4c9c934c8 100644
@@ -384,9 +384,9 @@ static int mvebu_sei_probe(struct platform_device *pdev)

drivers/irqchip/irq-mvebu-sei.c static int mvebu_sei_probe(struct platform_device *pdev) · line 392

Quoted 10 lines
drivers/irqchip/irq-mvebu-sei.c +2 -2
 	sei->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	sei->base = devm_ioremap_resource(sei->dev, sei->res);
-	if (!sei->base) {
+	if (IS_ERR(sei->base)) {
 		dev_err(sei->dev, "Failed to remap SEI resource\n");
-		return -ENODEV;
+		return PTR_ERR(sei->base);
 	}
 
 	/* Retrieve the SEI capabilities with the interrupt ranges */
Reviewed-by Miquel Raynal <[email protected]>

Thanks,
Miquèl

merge bot
#2 lore raw

[tip:irq/urgent] irqchip/irq-mvebu-sei: Fix a NULL vs IS_ERR() bug in probe function

In reply to Dan Carpenter
irqchip/irq-mvebu-sei: Fix a NULL vs IS_ERR() bug in probe function
Commit-ID:  3424243e39e8ec138486926949e3668e7553125d
Gitweb:     https://git.kernel.org/tip/3424243e39e8ec138486926949e3668e7553125d
Author:     Dan Carpenter <[email protected]>
AuthorDate: Sat, 13 Oct 2018 13:22:46 +0300
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Thu, 1 Nov 2018 12:38:48 +0100

irqchip/irq-mvebu-sei: Fix a NULL vs IS_ERR() bug in probe function

The devm_ioremap_resource() function never returns NULL, it returns error pointers.

Fixes 61ce8d8d8a81 ("irqchip/irq-mvebu-sei: Add new driver for Marvell SEI")
Signed-off-by Dan Carpenter <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
Reviewed-by Miquel Raynal <[email protected]>
Cc Jason Cooper <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc Gregory Clement <[email protected]>
Cc Sebastian Hesselbarth <[email protected]>
Cc Marc Zyngier <[email protected]>
Cc [email protected]
Cc [email protected]
Link https://lkml.kernel.org/r/20181013102246.GD16086@mwanda open here
---
 drivers/irqchip/irq-mvebu-sei.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/irqchip/irq-mvebu-sei.c +2 -2
index 566d69a2edbc..add4c9c934c8 100644
@@ -384,9 +384,9 @@ static int mvebu_sei_probe(struct platform_device *pdev)
 
 	sei->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	sei->base = devm_ioremap_resource(sei->dev, sei->res);
-	if (!sei->base) {
+	if (IS_ERR(sei->base)) {
 		dev_err(sei->dev, "Failed to remap SEI resource\n");
-		return -ENODEV;
+		return PTR_ERR(sei->base);
 	}
 
 	/* Retrieve the SEI capabilities with the interrupt ranges */