diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2017-06-21 09:07:52 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-06-21 09:07:52 +0200 |
| commit | f0cd9ae5d0df8668e76359a3e0e99856aa9c53b9 (patch) | |
| tree | 84d3297b16fa7e373f2eabef56cd12ae5a9b8a29 /kernel/irq/manage.c | |
| parent | posix-cpu-timers: Make timespec to nsec conversion safe (diff) | |
| parent | Merge branch 'clockevents/4.12-fixes' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent (diff) | |
| download | wireguard-linux-f0cd9ae5d0df8668e76359a3e0e99856aa9c53b9.tar.xz wireguard-linux-f0cd9ae5d0df8668e76359a3e0e99856aa9c53b9.zip | |
Merge branch 'timers/urgent' into timers/core
Pick up dependent changes.
Diffstat (limited to '')
| -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 | \ |