diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-18 18:40:41 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-18 18:40:41 +0900 |
| commit | 2277ba7cfd43c557eab882757b64755eb0a8ea95 (patch) | |
| tree | 4dac4c8cea62c20b1e183231148945640debac3f | |
| parent | 0cbf3415087c9ec997300b8ba15c12d26ac28e0a (diff) | |
| parent | fa07ab72cbb0d843429e61bf179308aed6cbe0dd (diff) | |
| download | linux-2277ba7cfd43c557eab882757b64755eb0a8ea95.tar.bz2 | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fix from Thomas Gleixner:
"Add a missing resource release to an error path"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
genirq: Release resources in __setup_irq() error path
| -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 070be980c37a..425170d4439b 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -1312,8 +1312,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 | \ |