diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-12 20:21:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-12 20:21:59 -0700 |
| commit | 6a022984c3feda8cc7d2d8c028b429715d0af531 (patch) | |
| tree | 62f00e615799204d3279887ae1bfe1a41c499052 /drivers | |
| parent | 54c63a75581f4b8d5d4b5660424f926510cfd98c (diff) | |
| parent | 325aa19598e410672175ed50982f902d4e3f31c5 (diff) | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Ingo Molnar:
"Two genirq fixes, plus an irqchip driver error handling fix"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
genirq: Respect IRQCHIP_SKIP_SET_WAKE in irq_chip_set_wake_parent()
genirq: Initialize request_mutex if CONFIG_SPARSE_IRQ=n
irqchip/irq-ls1x: Missing error code in ls1x_intc_of_init()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/irqchip/irq-ls1x.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-ls1x.c b/drivers/irqchip/irq-ls1x.c index 86b72fbd3b45..353111a10413 100644 --- a/drivers/irqchip/irq-ls1x.c +++ b/drivers/irqchip/irq-ls1x.c @@ -130,6 +130,7 @@ static int __init ls1x_intc_of_init(struct device_node *node, NULL); if (!priv->domain) { pr_err("ls1x-irq: cannot add IRQ domain\n"); + err = -ENOMEM; goto out_iounmap; } |