Commit-ID: 1fb51c975a80eab6b36fec203a178852fbb37665
Gitweb: https://git.kernel.org/tip/1fb51c975a80eab6b36fec203a178852fbb37665
Author: Wei Yongjun <weiyongjun1@xxxxxxxxxx>
AuthorDate: Mon, 17 Dec 2018 11:58:18 +0000
Committer: Marc Zyngier <marc.zyngier@xxxxxxx>
CommitDate: Tue, 18 Dec 2018 12:55:23 +0000
irqchip/irq-rda-intc: Fix return value check in rda8810_intc_init()
In case of error, the function of_io_request_and_map() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR().
Fixes: d852e62ad689 ("irqchip: Add RDA8810PL interrupt driver")
Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@xxxxxxxxxx>
Signed-off-by: Wei Yongjun <weiyongjun1@xxxxxxxxxx>
Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx>
---
drivers/irqchip/irq-rda-intc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/irqchip/irq-rda-intc.c b/drivers/irqchip/irq-rda-intc.c
index 1176291fdef8..960168303b73 100644
--- a/drivers/irqchip/irq-rda-intc.c
+++ b/drivers/irqchip/irq-rda-intc.c
@@ -85,8 +85,8 @@ static int __init rda8810_intc_init(struct device_node *node,
struct device_node *parent)
{
rda_intc_base = of_io_request_and_map(node, 0, "rda-intc");
- if (!rda_intc_base)
- return -ENXIO;
+ if (IS_ERR(rda_intc_base))
+ return PTR_ERR(rda_intc_base);
/* Mask all interrupt sources */
writel_relaxed(RDA_IRQ_MASK_ALL, rda_intc_base + RDA_INTC_MASK_CLR);
|