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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Sat, 18 Feb 2017 23:22:09 -0800
From:   tip-bot for Christophe JAILLET <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     christophe.jaillet@...adoo.fr, tglx@...utronix.de,
        linux-kernel@...r.kernel.org, mingo@...nel.org, hpa@...or.com
Subject: [tip:irq/core] irqchip/qcom: Fix error handling

Commit-ID:  3900dea4cda7c28d7921370bc4d22b08463ed94c
Gitweb:     http://git.kernel.org/tip/3900dea4cda7c28d7921370bc4d22b08463ed94c
Author:     Christophe JAILLET <christophe.jaillet@...adoo.fr>
AuthorDate: Sat, 18 Feb 2017 09:34:34 +0100
Committer:  Thomas Gleixner <tglx@...utronix.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@...adoo.fr>
Cc: marc.zyngier@....com
Cc: kernel-janitors@...r.kernel.org
Cc: jason@...edaemon.net
Link: http://lkml.kernel.org/r/20170218083434.2289-1-christophe.jaillet@wanadoo.fr
Signed-off-by: Thomas Gleixner <tglx@...utronix.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;
 	}