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: 13043315 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 838C5C43219 for ; Tue, 15 Nov 2022 08:20:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:CC :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=66wqVpW+2WQ0vebzTG2Mmsk2oV78vTEYDYO2vcZhMko=; b=KBm7WBxJPpMdrc UQyD1aOsnAAyN7wgIxAmyq2u12+e4jQnyC7ZWDGlBhouqW8WnnCkxAmQAcYZIJ9OEXG6mFNyoFDrc M9VFuP4vjEAqkDDjyzhMxNW6JecdV1ugUSa+MhhrkD0W1gjQKAgWGhIY6J1PCr8BCMyCofHjXyT0v jwoy6WpMVYbwaOqmuV4miNdmCoxH/Jg5dB0V/wLUHnrs3muiwSUqHJ+4E1WTgGMrjGZezIlB/JFI3 qT17gRNVHpO+6qvHwnhG2GR/pwWvwwu8B8KjmkituK6PnlmjohhGNnPMNHLsykQ9olAQMuLk/gzKV K8fRAXdhB89o5V7kfApg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ourAe-008vhO-N9; Tue, 15 Nov 2022 08:19:52 +0000 Received: from szxga08-in.huawei.com ([45.249.212.255]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ourAb-008veP-Ic for linux-arm-kernel@lists.infradead.org; Tue, 15 Nov 2022 08:19:51 +0000 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221115_001949_824848_27E23CD5 X-CRM114-Status: UNSURE ( 8.50 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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)