diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-10-16 10:26:46 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-10-16 10:26:46 +0200 |
| commit | 3d51969ce318963e5330bda74dcfac22da180c71 (patch) | |
| tree | d6a12a35eb4c30b3d7800e2bec274914b6ccf3a3 /drivers/irqchip/irq-tango.c | |
| parent | Linux 4.14-rc5 (diff) | |
| parent | genirq: generic chip: remove irq_gc_mask_disable_reg_and_ack() (diff) | |
| download | linux-3d51969ce318963e5330bda74dcfac22da180c71.tar.xz linux-3d51969ce318963e5330bda74dcfac22da180c71.zip | |
Merge tag 'irqchip-4.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
Pull irqchip updates for 4.14-rc5 from Marc Zyngier:
- Fix unfortunate mistake in the GICv3 ITS binding example
- Two fixes for the recently merged GICv4 support
- GICv3 ITS 52bit PA fixes
- Generic irqchip mask-ack fix, and its application to the tango irqchip
Diffstat (limited to 'drivers/irqchip/irq-tango.c')
| -rw-r--r-- | drivers/irqchip/irq-tango.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-tango.c b/drivers/irqchip/irq-tango.c index bdbb5c0ff7fe..0c085303a583 100644 --- a/drivers/irqchip/irq-tango.c +++ b/drivers/irqchip/irq-tango.c @@ -141,7 +141,7 @@ static void __init tangox_irq_init_chip(struct irq_chip_generic *gc, for (i = 0; i < 2; i++) { ct[i].chip.irq_ack = irq_gc_ack_set_bit; ct[i].chip.irq_mask = irq_gc_mask_disable_reg; - ct[i].chip.irq_mask_ack = irq_gc_mask_disable_reg_and_ack; + ct[i].chip.irq_mask_ack = irq_gc_mask_disable_and_ack_set; ct[i].chip.irq_unmask = irq_gc_unmask_enable_reg; ct[i].chip.irq_set_type = tangox_irq_set_type; ct[i].chip.name = gc->domain->name; |