diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2017-06-20 22:08:32 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-06-20 22:08:32 +0200 |
| commit | b50fb7c99217922ea36d6e38bae34d84c0587cad (patch) | |
| tree | 5f46167ac7fe5cd87bbed8ca8644f32befc5bbae /kernel/irq/manage.c | |
| parent | genirq: Warn when IRQ_NOAUTOEN is used with shared interrupts (diff) | |
| parent | Linux 4.12-rc6 (diff) | |
| download | wireguard-linux-b50fb7c99217922ea36d6e38bae34d84c0587cad.tar.xz wireguard-linux-b50fb7c99217922ea36d6e38bae34d84c0587cad.zip | |
Merge branch 'linus' into irq/core
Get upstream changes so pending patches won't conflict.
Diffstat (limited to 'kernel/irq/manage.c')
| -rw-r--r-- | kernel/irq/manage.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 49c37f1e71c0..4c34696ca575 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -1318,8 +1318,10 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) ret = __irq_set_trigger(desc, new->flags & IRQF_TRIGGER_MASK); - if (ret) + if (ret) { + irq_release_resources(desc); goto out_mask; + } } desc->istate &= ~(IRQS_AUTODETECT | IRQS_SPURIOUS_DISABLED | \ |