From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965655AbaCUAPw (ORCPT ); Thu, 20 Mar 2014 20:15:52 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:37416 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966170AbaCUAJo (ORCPT ); Thu, 20 Mar 2014 20:09:44 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marc Kleine-Budde Subject: [PATCH 3.4 28/35] can: flexcan: flexcan_open(): fix error path if flexcan_chip_start() fails Date: Thu, 20 Mar 2014 17:11:19 -0700 Message-Id: <20140321001055.079675280@linuxfoundation.org> X-Mailer: git-send-email 1.9.0 In-Reply-To: <20140321001054.038170009@linuxfoundation.org> References: <20140321001054.038170009@linuxfoundation.org> User-Agent: quilt/0.61-1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marc Kleine-Budde commit 7e9e148af01ef388efb6e2490805970be4622792 upstream. If flexcan_chip_start() in flexcan_open() fails, the interrupt is not freed, this patch adds the missing cleanup. Signed-off-by: Marc Kleine-Budde Signed-off-by: Greg Kroah-Hartman --- drivers/net/can/flexcan.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -805,7 +805,7 @@ static int flexcan_open(struct net_devic err = request_irq(dev->irq, flexcan_irq, IRQF_SHARED, dev->name, dev); if (err) - goto out_close; + goto out_free_irq; /* start chip and queuing */ err = flexcan_chip_start(dev); @@ -816,6 +816,8 @@ static int flexcan_open(struct net_devic return 0; + out_free_irq: + free_irq(dev->irq, dev); out_close: close_candev(dev); out: