diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-08-24 17:06:42 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-08-24 17:06:42 +0300 |
| commit | 20b420dc42629f115a0339a2474aec419ea32ea0 (patch) | |
| tree | a32fcaa846d4e3daf2daf0ae1826ac2804d5a908 /drivers/irqchip/irq-tango.c | |
| parent | f19f5c49bbc3ffcc9126cc245fc1b24cc29f4a37 (diff) | |
| parent | 4110b5cbb014ebaaeb3d18ac8b98470b7251847d (diff) | |
| download | linux-20b420dc42629f115a0339a2474aec419ea32ea0.tar.xz | |
Merge tag 'irqchip-4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
Pull irqchip updates for 4.19, take #2 from Marc Zyngier:
- bcm7038: compilation fix for !SMP
- stm32: fix teardown on probe error
- s3c24xx: fix compilation warning
- renesas-irqc: r8a774a1 support
- tango: chained irq setup simplification
- gic-v3: allow wake-up sources
Diffstat (limited to 'drivers/irqchip/irq-tango.c')
| -rw-r--r-- | drivers/irqchip/irq-tango.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-tango.c b/drivers/irqchip/irq-tango.c index 0c085303a583..580e2d72b9ba 100644 --- a/drivers/irqchip/irq-tango.c +++ b/drivers/irqchip/irq-tango.c @@ -205,8 +205,7 @@ static int __init tangox_irq_init(void __iomem *base, struct resource *baseres, tangox_irq_domain_init(dom); - irq_set_chained_handler(irq, tangox_irq_handler); - irq_set_handler_data(irq, dom); + irq_set_chained_handler_and_data(irq, tangox_irq_handler, dom); return 0; } |