diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-29 11:06:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-29 11:06:57 -0800 |
| commit | 8b7a51ba2637ee53ce90624f5f98aaf8ec9b2bcc (patch) | |
| tree | 879c13bb2342da47adbf51810dc72c9d430852b9 /drivers/irqchip/irq-sni-exiu.c | |
| parent | 1214917e008bb8989747b8bf9a721f7a6db8f8d7 (diff) | |
| parent | 7032908cd5842af9710de4815a456241b5e6d2d1 (diff) | |
Merge tag 'irq-urgent-2020-11-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner:
"Two fixes for irqchip drivers:
- Save and restore the GICV3 ITS state unconditionally on
suspend/resume to handle firmware which fails to do so.
- Use the correct index into the fwspec parameters to read the irq
trigger type in the EXIU chip driver"
* tag 'irq-urgent-2020-11-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip/gic-v3-its: Unconditionally save/restore the ITS state on suspend
irqchip/exiu: Fix the index of fwspec for IRQ type
Diffstat (limited to 'drivers/irqchip/irq-sni-exiu.c')
| -rw-r--r-- | drivers/irqchip/irq-sni-exiu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-sni-exiu.c b/drivers/irqchip/irq-sni-exiu.c index 1d027623c776..abd011fcecf4 100644 --- a/drivers/irqchip/irq-sni-exiu.c +++ b/drivers/irqchip/irq-sni-exiu.c @@ -136,7 +136,7 @@ static int exiu_domain_translate(struct irq_domain *domain, if (fwspec->param_count != 2) return -EINVAL; *hwirq = fwspec->param[0]; - *type = fwspec->param[2] & IRQ_TYPE_SENSE_MASK; + *type = fwspec->param[1] & IRQ_TYPE_SENSE_MASK; } return 0; } |