浏览代码

genirq: Release resources in __setup_irq() error path

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>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/655538f5-cb20-a892-ff15-fbd2dd1fa4ec@gmail.com
Heiner Kallweit 8 年之前
父节点
当前提交
fa07ab72cb
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      kernel/irq/manage.c

+ 3 - 1
kernel/irq/manage.c

@@ -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 | \