diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2017-10-27 16:53:39 +0300 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2017-10-27 16:53:39 +0300 |
| commit | 9b09342f5cfa5b4b3447de17de284111bfdeab26 (patch) | |
| tree | c71fcb17aecf0f77fb8e24f48feb07482f3cff77 /drivers/irqchip/irq-tango.c | |
| parent | b9e43e363d0115ca981c106d968e24140ad37f6c (diff) | |
| parent | 0224d45c9d46401b6d7018a96cfe049c5da7d91c (diff) | |
| download | linux-9b09342f5cfa5b4b3447de17de284111bfdeab26.tar.xz | |
Merge branch 'i2c/cht-wc-fusb302-immutable' into i2c/for-4.15
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; |