From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Sat, 10 Jun 2017 22:38:36 +0000 (+0200)
Subject: genirq: Release resources in __setup_irq() error path
X-Git-Tag: v4.4.74~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4d4d501cd7079d9052bb9ea6778f15491508f95e;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git

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: c1bacbae8192 ("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>
---

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 6ead200..a079ed1 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1287,8 +1287,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 | \