diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-29 10:49:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-29 10:49:24 -0800 |
| commit | 7a5a4f978750756755dc839014e13d1b088ccc8e (patch) | |
| tree | 2bb294a766da468712e9cc5559988aafcce1aa5b /drivers/irqchip/irq-bcm7120-l2.c | |
| parent | ed02bfa4aaf7fa015cbb8444d83a98f9f263c5df (diff) | |
| parent | d99ba4465a08138966083d6c256b2f66e85a5095 (diff) | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner:
"Three fixlets from the ARM SoC camp:
- correct irqdomain initialization for atmel-aic
- correct error handling for device tree parsing in bcm controllers"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip: brcmstb-l2: Fix error handling of irq_of_parse_and_map
irqchip: bcm7120-l2: Fix error handling of irq_of_parse_and_map
irqchip: atmel-aic: Fix irqdomain initialization
Diffstat (limited to 'drivers/irqchip/irq-bcm7120-l2.c')
| -rw-r--r-- | drivers/irqchip/irq-bcm7120-l2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-bcm7120-l2.c b/drivers/irqchip/irq-bcm7120-l2.c index b9f4fb808e49..5fb38a2ac226 100644 --- a/drivers/irqchip/irq-bcm7120-l2.c +++ b/drivers/irqchip/irq-bcm7120-l2.c @@ -101,9 +101,9 @@ static int bcm7120_l2_intc_init_one(struct device_node *dn, int parent_irq; parent_irq = irq_of_parse_and_map(dn, irq); - if (parent_irq < 0) { + if (!parent_irq) { pr_err("failed to map interrupt %d\n", irq); - return parent_irq; + return -EINVAL; } data->irq_map_mask |= be32_to_cpup(map_mask + irq); |