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
This commit is contained in:
commit
2277ba7cfd
|
@ -1312,8 +1312,10 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
|
||||||
ret = __irq_set_trigger(desc,
|
ret = __irq_set_trigger(desc,
|
||||||
new->flags & IRQF_TRIGGER_MASK);
|
new->flags & IRQF_TRIGGER_MASK);
|
||||||
|
|
||||||
if (ret)
|
if (ret) {
|
||||||
|
irq_release_resources(desc);
|
||||||
goto out_mask;
|
goto out_mask;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
desc->istate &= ~(IRQS_AUTODETECT | IRQS_SPURIOUS_DISABLED | \
|
desc->istate &= ~(IRQS_AUTODETECT | IRQS_SPURIOUS_DISABLED | \
|
||||||
|
|
Loading…
Reference in New Issue