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

tip-bot for Axel Lin tipbot at zytor.com
Fri May 22 02:10:06 PDT 2015

Commit-ID:  e1a96fb861b0781c8ef66a76d0fc6fb6f628f84c
Gitweb:     http://git.kernel.org/tip/e1a96fb861b0781c8ef66a76d0fc6fb6f628f84c
Author:     Axel Lin <axel.lin at ingics.com>
AuthorDate: Thu, 21 May 2015 22:57:34 +0800
Committer:  Thomas Gleixner <tglx at linutronix.de>
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 <axel.lin at ingics.com>
Reviewed-by: Matthias Brugger <matthias.bgg at gmail.com>
Cc: Yingjoe Chen <yingjoe.chen at mediatek.com>
Cc: linux-mediatek at lists.infradead.org <linux-mediatek at lists.infradead.org>
Cc: Jason Cooper <jason at lakedaemon.net>
Link: http://lkml.kernel.org/r/1432220254.29544.1.camel@ingics.com
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
 drivers/irqchip/irq-mtk-sysirq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-mtk-sysirq.c b/drivers/irqchip/irq-mtk-sysirq.c
index 04de2d4..15c1303 100644
--- a/drivers/irqchip/irq-mtk-sysirq.c
+++ b/drivers/irqchip/irq-mtk-sysirq.c
@@ -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;

More information about the Linux-mediatek mailing list