From patchwork Tue Nov 15 08:15:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinjie Ruan X-Patchwork-Id: 20238 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2586042wru; Tue, 15 Nov 2022 00:21:36 -0800 (PST) X-Google-Smtp-Source: AA0mqf6rvJdLp6eFfW1J2NBeKQXgfLEQudblUtaK0IKLpL7UV6sYwvYT87HfB8Uj4KZ191JTP9z3 X-Received: by 2002:aa7:96a2:0:b0:56b:f62c:4dc0 with SMTP id g2-20020aa796a2000000b0056bf62c4dc0mr17052669pfk.79.1668500496329; Tue, 15 Nov 2022 00:21:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668500496; cv=none; d=google.com; s=arc-20160816; b=rlVdCwt+dy6mCB0g87J/W+QMsZtMj+ydz5TRUmKbpJym/DG6qVkUDHg7Zi2KPwITMQ NuZmufqHjDdjexvG/rXnXANlNuEhDEjm37dajyR1mQ7HA9UorhHE2DqZdrXRbWezEnXa fqBIfrqpqFLGeaIKQZnNz6gVRNg5opXBPOmZbgHBzBlYl6DFDdwSIyuU51F/7iWkfWm1 UdcgaI5fl+vrGyiuYbjEUq6Vk+E/Vk0Dcz+4v0k/hw+f/9MKdpnB5Z4ziloYVTSedg6H L/JTsTClrK11MFuML8JAckcYEieVd8eTrxlwbihz3Q4bmnfa3spldM4ZSRg0r9ZOMOtB qG+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=FhvrRBO+r8skXs6SvGBM+oSR5EFHL4iDdn/35jjaJtg=; b=xhtnsfSQZ+vY8OftowlM/DRRfa2uaVLYt6/7ODiFxudkaXQ+vtjBnndKacb6Oowaoi H0leFLJk3vx+6zO5eWLQW5+FpExnAav6A8ltbwnxi7LCaojhLLFwWQiJIIAAsz61+MVA d/bEiD9OxEzSamxzPA1uA+kmC6j1Fz20WhkMBVPbFoY8P8FbL6C+K6iuzYNYg5gkA7bL 23m2Fi/id73ZVpyXrepp1SyPzF8ZOgNkoSI4qmbKNeE4PRQEdyRL7o0v6YJqcdd20NDu +MC2Jl5Sgr41WzAOTawcYkFCqxkeUZRS5eZNSzLfsOsVjciK8V2TaqTTWMDYk/C1Akel H4lw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j10-20020a056a00174a00b0057253eb694bsi3070602pfc.214.2022.11.15.00.21.22; Tue, 15 Nov 2022 00:21:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232672AbiKOITo (ORCPT + 99 others); Tue, 15 Nov 2022 03:19:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229455AbiKOITn (ORCPT ); Tue, 15 Nov 2022 03:19:43 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4DEFDCA; Tue, 15 Nov 2022 00:19:42 -0800 (PST) Received: from kwepemi500008.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4NBJxN67TCz15Mbt; Tue, 15 Nov 2022 16:19:20 +0800 (CST) Received: from huawei.com (10.67.175.83) by kwepemi500008.china.huawei.com (7.221.188.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 15 Nov 2022 16:19:09 +0800 From: ruanjinjie To: , , , , CC: Subject: [PATCH] dmaengine: ste_dma40: add missing free_irq() in error path Date: Tue, 15 Nov 2022 16:15:46 +0800 Message-ID: <20221115081546.2389164-1-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.67.175.83] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemi500008.china.huawei.com (7.221.188.139) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749549576224010424?= X-GMAIL-MSGID: =?utf-8?q?1749549576224010424?= free_irq() is missing in some cases of error in d40_probe(), fix that. Signed-off-by: ruanjinjie --- drivers/dma/ste_dma40.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index f093e08c23b1..1cedb53bc3dd 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -3611,7 +3611,7 @@ static int __init d40_probe(struct platform_device *pdev) d40_err(&pdev->dev, "Failed to get lcpa_regulator\n"); ret = PTR_ERR(base->lcpa_regulator); base->lcpa_regulator = NULL; - goto destroy_cache; + goto free_irq; } ret = regulator_enable(base->lcpa_regulator); @@ -3620,7 +3620,7 @@ static int __init d40_probe(struct platform_device *pdev) "Failed to enable lcpa_regulator\n"); regulator_put(base->lcpa_regulator); base->lcpa_regulator = NULL; - goto destroy_cache; + goto free_irq; } } @@ -3635,12 +3635,12 @@ static int __init d40_probe(struct platform_device *pdev) ret = d40_dmaengine_init(base, num_reserved_chans); if (ret) - goto destroy_cache; + goto free_irq; ret = dma_set_max_seg_size(base->dev, STEDMA40_MAX_SEG_SIZE); if (ret) { d40_err(&pdev->dev, "Failed to set dma max seg size\n"); - goto destroy_cache; + goto free_irq; } d40_hw_init(base); @@ -3654,6 +3654,8 @@ static int __init d40_probe(struct platform_device *pdev) dev_info(base->dev, "initialized\n"); return 0; +free_irq: + free_irq(base->irq, base); destroy_cache: kmem_cache_destroy(base->desc_slab); if (base->virtbase)