* [PATCH] irqchip/qcom: Fix error handling
@ 2017-02-18 8:34 Christophe JAILLET
2017-02-18 9:22 ` [tip:irq/core] " tip-bot for Christophe JAILLET
2017-02-19 7:22 ` tip-bot for Christophe JAILLET
0 siblings, 2 replies; 3+ messages in thread
From: Christophe JAILLET @ 2017-02-18 8:34 UTC (permalink / raw)
To: tglx, jason, marc.zyngier
Cc: linux-kernel, kernel-janitors, Christophe JAILLET
'devm_ioremap()' returns NULL on error, not an error pointer.
Fixes: f20cc9b00c7b ("irqchip/qcom: Add IRQ combiner driver")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/irqchip/qcom-irq-combiner.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/irqchip/qcom-irq-combiner.c b/drivers/irqchip/qcom-irq-combiner.c
index 03251da95397..226558698344 100644
--- a/drivers/irqchip/qcom-irq-combiner.c
+++ b/drivers/irqchip/qcom-irq-combiner.c
@@ -202,9 +202,9 @@ static acpi_status get_registers_cb(struct acpi_resource *ares, void *context)
}
vaddr = devm_ioremap(ctx->dev, reg->address, REG_SIZE);
- if (IS_ERR(vaddr)) {
+ if (!vaddr) {
dev_err(ctx->dev, "Can't map register @%pa\n", &paddr);
- ctx->err = PTR_ERR(vaddr);
+ ctx->err = -ENOMEM;
return AE_ERROR;
}
--
2.9.3
^ permalink raw reply [flat|nested] 3+ messages in thread* [tip:irq/core] irqchip/qcom: Fix error handling
2017-02-18 8:34 [PATCH] irqchip/qcom: Fix error handling Christophe JAILLET
@ 2017-02-18 9:22 ` tip-bot for Christophe JAILLET
2017-02-19 7:22 ` tip-bot for Christophe JAILLET
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Christophe JAILLET @ 2017-02-18 9:22 UTC (permalink / raw)
To: linux-tip-commits; +Cc: tglx, linux-kernel, christophe.jaillet, mingo, hpa
Commit-ID: 569293c9ca9c5b9b5f7fa3c314ffceafc62957a8
Gitweb: http://git.kernel.org/tip/569293c9ca9c5b9b5f7fa3c314ffceafc62957a8
Author: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
AuthorDate: Sat, 18 Feb 2017 09:34:34 +0100
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Sat, 18 Feb 2017 10:19:07 +0100
irqchip/qcom: Fix error handling
'devm_ioremap()' returns NULL on error, not an error pointer.
Fixes: f20cc9b00c7b ("irqchip/qcom: Add IRQ combiner driver")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: marc.zyngier@arm.com
Cc: kernel-janitors@vger.kernel.org
Cc: jason@lakedaemon.net
Link: http://lkml.kernel.org/r/20170218083434.2289-1-christophe.jaillet@wanadoo.fr
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
drivers/irqchip/qcom-irq-combiner.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/irqchip/qcom-irq-combiner.c b/drivers/irqchip/qcom-irq-combiner.c
index 03251da..2265586 100644
--- a/drivers/irqchip/qcom-irq-combiner.c
+++ b/drivers/irqchip/qcom-irq-combiner.c
@@ -202,9 +202,9 @@ static acpi_status get_registers_cb(struct acpi_resource *ares, void *context)
}
vaddr = devm_ioremap(ctx->dev, reg->address, REG_SIZE);
- if (IS_ERR(vaddr)) {
+ if (!vaddr) {
dev_err(ctx->dev, "Can't map register @%pa\n", &paddr);
- ctx->err = PTR_ERR(vaddr);
+ ctx->err = -ENOMEM;
return AE_ERROR;
}
^ permalink raw reply [flat|nested] 3+ messages in thread* [tip:irq/core] irqchip/qcom: Fix error handling
2017-02-18 8:34 [PATCH] irqchip/qcom: Fix error handling Christophe JAILLET
2017-02-18 9:22 ` [tip:irq/core] " tip-bot for Christophe JAILLET
@ 2017-02-19 7:22 ` tip-bot for Christophe JAILLET
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Christophe JAILLET @ 2017-02-19 7:22 UTC (permalink / raw)
To: linux-tip-commits; +Cc: christophe.jaillet, tglx, linux-kernel, mingo, hpa
Commit-ID: 3900dea4cda7c28d7921370bc4d22b08463ed94c
Gitweb: http://git.kernel.org/tip/3900dea4cda7c28d7921370bc4d22b08463ed94c
Author: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
AuthorDate: Sat, 18 Feb 2017 09:34:34 +0100
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Sun, 19 Feb 2017 08:17:25 +0100
irqchip/qcom: Fix error handling
'devm_ioremap()' returns NULL on error, not an error pointer.
Fixes: f20cc9b00c7b ("irqchip/qcom: Add IRQ combiner driver")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: marc.zyngier@arm.com
Cc: kernel-janitors@vger.kernel.org
Cc: jason@lakedaemon.net
Link: http://lkml.kernel.org/r/20170218083434.2289-1-christophe.jaillet@wanadoo.fr
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
drivers/irqchip/qcom-irq-combiner.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/irqchip/qcom-irq-combiner.c b/drivers/irqchip/qcom-irq-combiner.c
index 03251da..2265586 100644
--- a/drivers/irqchip/qcom-irq-combiner.c
+++ b/drivers/irqchip/qcom-irq-combiner.c
@@ -202,9 +202,9 @@ static acpi_status get_registers_cb(struct acpi_resource *ares, void *context)
}
vaddr = devm_ioremap(ctx->dev, reg->address, REG_SIZE);
- if (IS_ERR(vaddr)) {
+ if (!vaddr) {
dev_err(ctx->dev, "Can't map register @%pa\n", &paddr);
- ctx->err = PTR_ERR(vaddr);
+ ctx->err = -ENOMEM;
return AE_ERROR;
}
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-02-19 7:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-18 8:34 [PATCH] irqchip/qcom: Fix error handling Christophe JAILLET
2017-02-18 9:22 ` [tip:irq/core] " tip-bot for Christophe JAILLET
2017-02-19 7:22 ` tip-bot for Christophe JAILLET
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome