From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753028AbdFLWpe (ORCPT ); Mon, 12 Jun 2017 18:45:34 -0400 Received: from terminus.zytor.com ([65.50.211.136]:39185 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752653AbdFLWpd (ORCPT ); Mon, 12 Jun 2017 18:45:33 -0400 Date: Mon, 12 Jun 2017 15:43:24 -0700 From: tip-bot for Heiner Kallweit Message-ID: Cc: hpa@zytor.com, linux-kernel@vger.kernel.org, hkallweit1@gmail.com, mingo@kernel.org, tglx@linutronix.de Reply-To: hkallweit1@gmail.com, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org In-Reply-To: <655538f5-cb20-a892-ff15-fbd2dd1fa4ec@gmail.com> References: <655538f5-cb20-a892-ff15-fbd2dd1fa4ec@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] genirq: Release resources in __setup_irq() error path Git-Commit-ID: fa07ab72cbb0d843429e61bf179308aed6cbe0dd X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: fa07ab72cbb0d843429e61bf179308aed6cbe0dd Gitweb: http://git.kernel.org/tip/fa07ab72cbb0d843429e61bf179308aed6cbe0dd Author: Heiner Kallweit AuthorDate: Sun, 11 Jun 2017 00:38:36 +0200 Committer: Thomas Gleixner CommitDate: Tue, 13 Jun 2017 00:40:39 +0200 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 Signed-off-by: Thomas Gleixner Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/655538f5-cb20-a892-ff15-fbd2dd1fa4ec@gmail.com --- kernel/irq/manage.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 070be98..425170d 100644 --- a/kernel/irq/manage.c +++ b/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, new->flags & IRQF_TRIGGER_MASK); - if (ret) + if (ret) { + irq_release_resources(desc); goto out_mask; + } } desc->istate &= ~(IRQS_AUTODETECT | IRQS_SPURIOUS_DISABLED | \