From: tip-bot for Christophe JAILLET <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: christophe.jaillet@wanadoo.fr, tglx@linutronix.de,
linux-kernel@vger.kernel.org, mingo@kernel.org, hpa@zytor.com
Subject: [tip:irq/core] irqchip/qcom: Fix error handling
Date: Sat, 18 Feb 2017 23:22:09 -0800 [thread overview]
Message-ID: <tip-3900dea4cda7c28d7921370bc4d22b08463ed94c@git.kernel.org> (raw)
In-Reply-To: <20170218083434.2289-1-christophe.jaillet@wanadoo.fr>
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;
}
prev parent reply other threads:[~2017-02-19 7:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-3900dea4cda7c28d7921370bc4d22b08463ed94c@git.kernel.org \
--to=tipbot@zytor.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox