From patchwork Thu Mar 9 14:40:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Xiang X-Patchwork-Id: 9613611 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 028D260414 for ; Thu, 9 Mar 2017 15:53:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E0FA028680 for ; Thu, 9 Mar 2017 15:53:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D5BAF28684; Thu, 9 Mar 2017 15:53:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_WEB autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49B8928680 for ; Thu, 9 Mar 2017 15:53:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932613AbdCIPxm (ORCPT ); Thu, 9 Mar 2017 10:53:42 -0500 Received: from [211.100.40.186] ([211.100.40.186]:24526 "HELO smtp.tom.com" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with SMTP id S932430AbdCIPxm (ORCPT ); Thu, 9 Mar 2017 10:53:42 -0500 X-Greylist: delayed 4361 seconds by postgrey-1.27 at vger.kernel.org; Thu, 09 Mar 2017 10:53:41 EST Received: from smtp.tom.com (bjsd-antispam2 [172.24.202.205]) by bjsd-tm-app5.localdomain (SMTP) with ESMTP id 98704236F5C5 for ; Thu, 9 Mar 2017 22:40:06 +0800 (CST) Authentication-Results: bjsd-antispam2 smtp.user=liuxiang_1999@tom.com; auth=pass (LOGIN) Received: from [171.221.128.202] ([171.221.128.202:40636] helo=localhost) by bjsd-antispam2 (envelope-from ) (ecelerity 3.5.4.38585 r(Platform:3.5.4.0)) with ESMTPA id 5E/E2-12318-44961C85; Thu, 09 Mar 2017 22:40:04 +0800 From: Liu Xiang To: broonie@kernel.org Cc: linux-spi@vger.kernel.org, Liu Xiang Subject: [PATCH] spi: fsl: Call irq_dispose_mapping in err path Date: Thu, 9 Mar 2017 22:40:01 +0800 Message-Id: <1489070401-5663-1-git-send-email-liu.xiang6@zte.com.cn> X-Mailer: git-send-email 1.9.1 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Irq_dispose_mapping should be called in err path to release the resources that irq_of_parse_and_map requested. Signed-off-by: Liu Xiang --- drivers/spi/spi-fsl-spi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c index 8b290d9..5920343 100644 --- a/drivers/spi/spi-fsl-spi.c +++ b/drivers/spi/spi-fsl-spi.c @@ -813,7 +813,7 @@ static int of_fsl_spi_probe(struct platform_device *ofdev) struct device_node *np = ofdev->dev.of_node; struct spi_master *master; struct resource mem; - int irq, type; + int irq = 0, type; int ret = -ENOMEM; ret = of_mpc8xxx_spi_probe(ofdev); @@ -846,6 +846,7 @@ static int of_fsl_spi_probe(struct platform_device *ofdev) return 0; err: + irq_dispose_mapping(irq); if (type == TYPE_FSL) of_fsl_spi_free_chipselects(dev); return ret;