Skip to content

Commit 4d4d501

Browse files
hkallweitgregkh
authored andcommitted
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: c1bacba ("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>
1 parent 6af9009 commit 4d4d501

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

kernel/irq/manage.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1287,8 +1287,10 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
12871287
ret = __irq_set_trigger(desc,
12881288
new->flags & IRQF_TRIGGER_MASK);
12891289

1290-
if (ret)
1290+
if (ret) {
1291+
irq_release_resources(desc);
12911292
goto out_mask;
1293+
}
12921294
}
12931295

12941296
desc->istate &= ~(IRQS_AUTODETECT | IRQS_SPURIOUS_DISABLED | \

0 commit comments

Comments
 (0)