[tip:irq/core] irqchip/qcom: Fix error handling

From	tip-bot for Christophe JAILLET <tipbot@zytor.com>
Newsgroups	linux.kernel
Subject	[tip:irq/core] irqchip/qcom: Fix error handling
Date	2017-02-19 08:50 +0100
Message-ID	<tcupP-4Ba-1@gated-at.bofh.it> (permalink)
References	<tc8Sl-81B-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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;
 	}

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH] irqchip/qcom: Fix error handling Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2017-02-18 09:50 +0100
  [tip:irq/core] irqchip/qcom: Fix error handling tip-bot for Christophe JAILLET <tipbot@zytor.com> - 2017-02-18 10:30 +0100
  [tip:irq/core] irqchip/qcom: Fix error handling tip-bot for Christophe JAILLET <tipbot@zytor.com> - 2017-02-19 08:50 +0100

csiph-web