diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2016-05-11 13:06:25 +0300 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2016-05-11 13:06:25 +0300 |
commit | 0097852c302aca943a8b76f7f85e133af6e1701a (patch) | |
tree | 8246d163344fbe26dca0691602ceeff2d6503733 /drivers/irqchip/irq-tegra.c | |
parent | 9d9b7eed59eb847c229225e6465fc2ead9971902 (diff) | |
parent | a1dcbd11d09be1cb357b2f217c0eaa1461128da0 (diff) | |
download | linux-0097852c302aca943a8b76f7f85e133af6e1701a.tar.xz |
Merge tag 'irqchip-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull irqchip updates for Linux 4.7 from Marc Zyngier
- Layerscape SCFG MSI controller support
- LPC32xx interrupt controller support
- RPi irqchip support on arm64
- GICv2 cleanup
- GICv2 and GICv3 bug fixes
Diffstat (limited to 'drivers/irqchip/irq-tegra.c')
-rw-r--r-- | drivers/irqchip/irq-tegra.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-tegra.c b/drivers/irqchip/irq-tegra.c index 50be9639e27e..e902f081e16c 100644 --- a/drivers/irqchip/irq-tegra.c +++ b/drivers/irqchip/irq-tegra.c @@ -235,7 +235,7 @@ static int tegra_ictlr_domain_translate(struct irq_domain *d, return -EINVAL; *hwirq = fwspec->param[1]; - *type = fwspec->param[2]; + *type = fwspec->param[2] & IRQ_TYPE_SENSE_MASK; return 0; } |