Commit 4d4d501c authored Jun 11, 2017 by Heiner Kallweit Committed by Greg Kroah-Hartman Jun 26, 2017

genirq: Release resources in __setup_irq() error path



commit fa07ab72cbb0d843429e61bf179308aed6cbe0dd upstream.

In case __irq_set_trigger() fails the resources requested via
irq_request_resources() are not released.

Add the missing release call into the error handling path.

Fixes: c1bacbae ("genirq: Provide irq_request/release_resources chip callbacks")
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/655538f5-cb20-a892-ff15-fbd2dd1fa4ec@gmail.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 6af90091

kernel/irq/manage.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1287,9 +1287,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);