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 /kernel | |
| 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 'kernel')
| -rw-r--r-- | kernel/irq/manage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index cc1cc641d653..ef0bc02c3a70 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -1407,7 +1407,7 @@ int setup_irq(unsigned int irq, struct irqaction *act) int retval; struct irq_desc *desc = irq_to_desc(irq); - if (WARN_ON(irq_settings_is_per_cpu_devid(desc))) + if (!desc || WARN_ON(irq_settings_is_per_cpu_devid(desc))) return -EINVAL; chip_bus_lock(desc); retval = __setup_irq(irq, desc, act); |