Commit 1fb51c97 authored Dec 17, 2018 by Wei Yongjun Committed by Marc Zyngier Dec 18, 2018

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: d852e62a ("irqchip: Add RDA8810PL interrupt driver")
Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

parent 893b0aff

drivers/irqchip/irq-rda-intc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message