diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-03-04 23:02:18 +0300 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2019-03-05 00:12:29 +0300 |
| commit | 7d3a5eb78e3614b025389d2cd89d6d85e91f5549 (patch) | |
| tree | c424177f844619880f7a2fe6d1bca20393e74973 /drivers/irqchip/irq-imx-irqsteer.c | |
| parent | 28528fca4908142bd1a3247956cba56c9c667d71 (diff) | |
| download | linux-7d3a5eb78e3614b025389d2cd89d6d85e91f5549.tar.xz | |
irqchip/imx-irqsteer: Fix of_property_read_u32() error handling
gcc points out that irqs_num is not initialized when of_property_read_u32()
is an empty stub function:
Included from drivers/irqchip/irq-imx-irqsteer.c:7:
drivers/irqchip/irq-imx-irqsteer.c: In function 'imx_irqsteer_probe':
include/uapi/linux/kernel.h:13:49: error: 'irqs_num' may be used uninitialized in this function [-Werror=maybe-uninitialized]
The same can actually happen with CONFIG_OF=y as well, though we don't
get a warning then.
Add error checking here that lets the code deal with missing or
invalid properties as well as avoid the warning.
Fixes: 28528fca4908 ("irqchip/imx-irqsteer: Add multi output interrupts support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
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. |