From: tip-bot for Wei Yongjun <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: mingo@kernel.org, weiyongjun1@huawei.com, tglx@linutronix.de,
hpa@zytor.com, marc.zyngier@arm.com,
linux-kernel@vger.kernel.org, jason@lakedaemon.net,
ard.biesheuvel@linaro.org
Subject: [tip:irq/urgent] irqchip/exiu: Fix return value check in exiu_init()
Date: Tue, 14 Nov 2017 02:30:41 -0800 [thread overview]
Message-ID: <tip-0e54705b0e01dcaf3eb2a496bb66d5f05012056b@git.kernel.org> (raw)
In-Reply-To: <1510642648-123574-1-git-send-email-weiyongjun1@huawei.com>
Commit-ID: 0e54705b0e01dcaf3eb2a496bb66d5f05012056b
Gitweb: https://git.kernel.org/tip/0e54705b0e01dcaf3eb2a496bb66d5f05012056b
Author: Wei Yongjun <weiyongjun1@huawei.com>
AuthorDate: Tue, 14 Nov 2017 06:57:28 +0000
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Tue, 14 Nov 2017 11:27:22 +0100
irqchip/exiu: Fix return value check in exiu_init()
In case of error, the function of_iomap() returns NULL pointer not
ERR_PTR().
Replace the IS_ERR() test of the return value with NULL test and return
a proper error code.
Fixes: 706cffc1b912 ("irqchip/exiu: Add support for Socionext Synquacer EXIU controller")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Link: https://lkml.kernel.org/r/1510642648-123574-1-git-send-email-weiyongjun1@huawei.com
---
drivers/irqchip/irq-sni-exiu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/irqchip/irq-sni-exiu.c b/drivers/irqchip/irq-sni-exiu.c
index 1b6e2f7..1927b2f 100644
--- a/drivers/irqchip/irq-sni-exiu.c
+++ b/drivers/irqchip/irq-sni-exiu.c
@@ -196,8 +196,8 @@ static int __init exiu_init(struct device_node *node,
}
data->base = of_iomap(node, 0);
- if (IS_ERR(data->base)) {
- err = PTR_ERR(data->base);
+ if (!data->base) {
+ err = -ENODEV;
goto out_free;
}
prev parent reply other threads:[~2017-11-14 10:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-14 6:57 [PATCH -next] " Wei Yongjun
2017-11-14 9:55 ` Ard Biesheuvel
2017-11-14 10:19 ` Marc Zyngier
2017-11-14 10:30 ` tip-bot for Wei Yongjun [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-0e54705b0e01dcaf3eb2a496bb66d5f05012056b@git.kernel.org \
--to=tipbot@zytor.com \
--cc=ard.biesheuvel@linaro.org \
--cc=hpa@zytor.com \
--cc=jason@lakedaemon.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=weiyongjun1@huawei.com \
/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
Powered by JetHome