Commit 2277ba7c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0cbf3415 fa07ab72

kernel/irq/manage.c

+3 −1
Original line number Diff line number Diff line
@@ -1312,9 +1312,11 @@ __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 | \

				  IRQS_ONESHOT | IRQS_WAITING);