diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2019-03-21 12:30:54 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2019-03-21 12:30:54 +0100 |
commit | 3ce8461f45a7486b286afa2ae5619ce6aed8b6db (patch) | |
tree | cc445fa3aed0f434bde55320080d8e4969066a5d /drivers/irqchip/irq-imx-irqsteer.c | |
parent | 551417af91b163bd697eb50b3601adae2177c28a (diff) | |
parent | fca269f201a8d9985c0a31fb60b15d4eb57cef80 (diff) |
Merge tag 'irqchip-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
Pull irqchip updates for 5.1 from Marc Zyngier:
- irqsteer error handling fix
- GICv3 range coalescing fix
- stm32 coprocessor coexistence fixes
- mbigen MSI teardown fix
- non-DT secondary GIC infrastructure removed
- various cleanups (brcmstb-l2, mmp)
- new DT bindings (r8a774c0)
Diffstat (limited to 'drivers/irqchip/irq-imx-irqsteer.c')
-rw-r--r-- | drivers/irqchip/irq-imx-irqsteer.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-imx-irqsteer.c b/drivers/irqchip/irq-imx-irqsteer.c index d1098f4da6a4..88df3d00052c 100644 --- a/drivers/irqchip/irq-imx-irqsteer.c +++ b/drivers/irqchip/irq-imx-irqsteer.c @@ -169,8 +169,12 @@ static int imx_irqsteer_probe(struct platform_device *pdev) raw_spin_lock_init(&data->lock); - of_property_read_u32(np, "fsl,num-irqs", &irqs_num); - of_property_read_u32(np, "fsl,channel", &data->channel); + ret = of_property_read_u32(np, "fsl,num-irqs", &irqs_num); + if (ret) + return ret; + ret = of_property_read_u32(np, "fsl,channel", &data->channel); + if (ret) + return ret; /* * There is one output irq for each group of 64 inputs. |