diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-03 16:12:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-03 16:12:35 -0700 |
| commit | 8c52b6dcdd1994ad0d2672e43c8d975d5c8195c3 (patch) | |
| tree | bcf21423c13b62861e9f856e3d1b1bdf196afa1b /kernel | |
| parent | 2c221325635ed09a6eea10a362d8514d5943ad7d (diff) | |
| parent | 2eec3707a33fbf1c2e0a88ffc9fc0e465c2a59fd (diff) | |
| download | linux-8c52b6dcdd1994ad0d2672e43c8d975d5c8195c3.tar.bz2 | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner:
- a few simple fixes for fallout from the recent gic-v3 changes
- a workaround for a Cavium thunderX erratum
- a bugfix for the pic32 irqchip to make external interrupts work proper
- a missing return value in the generic IPI management code
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip/irq-pic32-evic: Fix bug with external interrupts.
irqchip/gicv3-its: numa: Enable workaround for Cavium thunderx erratum 23144
irqchip/gic-v3: Fix quiescence check in gic_enable_redist
irqchip/gic-v3: Fix copy+paste mistakes in defines
irqchip/gic-v3: Fix ICC_SGI1R_EL1.INTID decoding mask
genirq: Fix missing return value in irq_destroy_ipi()
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/ipi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/ipi.c b/kernel/irq/ipi.c index c42742208e5e..89b49f6773f0 100644 --- a/kernel/irq/ipi.c +++ b/kernel/irq/ipi.c @@ -125,7 +125,7 @@ int irq_destroy_ipi(unsigned int irq, const struct cpumask *dest) domain = data->domain; if (WARN_ON(domain == NULL)) - return; + return -EINVAL; if (!irq_domain_is_ipi(domain)) { pr_warn("Trying to destroy a non IPI domain!\n"); |