irqchip: irq-mtk-sysirq: Make mtk_sysirq_of_init return error if ioremap fails

PATCH In review Axel Lin 3 participants 3 messages May 21, 2015 – May 22, 2015

Subsystems (2)

Arm MediaTek irqchip drivers

lore

Share & tools

lore

Axel Lin

author

2015-05-21 14:57 UTC #0 lore raw

PATCH 1/1 irqchip: irq-mtk-sysirq: Make mtk_sysirq_of_init return error if ioremap fails

PTR_ERR(NULL) returns 0 so current code returns 0 if ioremap fails, fix it.

Signed-off-by Axel Lin <[email protected]>

---
 drivers/irqchip/irq-mtk-sysirq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/irqchip/irq-mtk-sysirq.c +1 -1

index 04de2d4..15c1303 100644
@@ -144,7 +144,7 @@ static int __init mtk_sysirq_of_init(struct device_node *node,
 	chip_data->intpol_base = ioremap(res.start, size);
 	if (!chip_data->intpol_base) {
 		pr_err("mtk_sysirq: unable to map sysirq register\n");
-		ret = PTR_ERR(chip_data->intpol_base);
+		ret = -ENXIO;
 		goto out_free;
 	}

Signature · 1 line

2.1.0

Matthias Brugger

maintainer Reviewed-by on v1 1/1

2015-05-21 15:36 UTC #1 lore raw

2015-05-21 16:57 GMT+02:00 Axel Lin <[email protected]>:

Quoted 3 lines

PTR_ERR(NULL) returns 0 so current code returns 0 if ioremap fails, fix it.
Signed-off-by Axel Lin <[email protected]>

Reviewed-by Matthias Brugger <[email protected]>

tip-bot for Axel Lin

merge bot

2015-05-22 09:10 UTC #2 lore raw

[tip:irq/core] irqchip: mtk-sysirq: Make mtk_sysirq_of_init return error if ioremap fails

In reply to Axel Lin

irqchip: mtk-sysirq: Make mtk_sysirq_of_init return error if ioremap fails

Commit-ID:  e1a96fb861b0781c8ef66a76d0fc6fb6f628f84c
Gitweb:     http://git.kernel.org/tip/e1a96fb861b0781c8ef66a76d0fc6fb6f628f84c
Author:     Axel Lin <[email protected]>
AuthorDate: Thu, 21 May 2015 22:57:34 +0800
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Fri, 22 May 2015 11:06:47 +0200

irqchip: mtk-sysirq: Make mtk_sysirq_of_init return error if ioremap fails

PTR_ERR(NULL) returns 0 so current code returns 0 if ioremap fails, fix it.

Signed-off-by Axel Lin <[email protected]>

Reviewed-by Matthias Brugger <[email protected]>

Cc Yingjoe Chen <[email protected]>

Cc [email protected] <[email protected]>

Cc Jason Cooper <[email protected]>

Link http://lkml.kernel.org/r/[email protected] open here

Signed-off-by Thomas Gleixner <[email protected]>

---
 drivers/irqchip/irq-mtk-sysirq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/irqchip/irq-mtk-sysirq.c +1 -1

index 04de2d4..15c1303 100644
@@ -144,7 +144,7 @@ static int __init mtk_sysirq_of_init(struct device_node *node,
 	chip_data->intpol_base = ioremap(res.start, size);
 	if (!chip_data->intpol_base) {
 		pr_err("mtk_sysirq: unable to map sysirq register\n");
-		ret = PTR_ERR(chip_data->intpol_base);
+		ret = -ENXIO;
 		goto out_free;
 	}