From patchwork Thu Dec 10 14:26:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 341065 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp5841338jai; Thu, 10 Dec 2020 11:41:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJwmbS+YUqJJyX/+dkt4Kjj7jEtSMxs4lNrpRRWRLpejhsqlg4qZMau3Zx7B05sYh7k/LiFs X-Received: by 2002:a50:ccc8:: with SMTP id b8mr8350956edj.152.1607629314445; Thu, 10 Dec 2020 11:41:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607629314; cv=none; d=google.com; s=arc-20160816; b=UXT0qhKnHBxICUsK1XiSM9fxbhZScS4/UyAHT7dZiolJFHVBP1LXatfv2lrn6tHeL8 n8A2Mcbm6YVxl8S+lOv2NqUIOqZFapnIrvznDhsLjI8cXoky6rKUOG10ni2RaKnV0jsx 1w3zjFbQ3IEfZF+eSIABHsAAE9WT0sOlcpkk+NqhEPhhrXNorZTZ64xcYT6wiGJ6SsJ3 WxzGY60Z7W+cXpFTpcujzZYzSe+j7lSR8f3/dnhocqbogCsmWuiRhVPaJxPVaMiZ4IRR /TqEQkhaL3stU7WQy8CD5g6lf1DNAMujhUVl5KcGMY2w9q1uE8PJE9KjSoaKbciDO1FL Dnng== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from; bh=SmVyndvdkt3VWk99FtQDJXJJj7dhWOZkNuw9ttN5fvw=; b=gadh7utISQOx27o/huPF5wNzuwWuHThEddrkpNVQFQXs9FcXAVuhwxSXj8tLCI+nga EZvz7G8VpxcXAJkm1gSUsiOKVJNNFMZ08Xy6hJwo405xjO9YzMfZ5wWAMD6tEHi6i36k Ge9lpLLq4Z4SKH9pymXLFTG7DONRZbQhSdhe473Rqn7yoPDznllXMQp39aq2se6KDodR g6H6zoL1gttjZ/LiJSVkrOqyFmS2N3bdDkwoMjj4Mef1plP05NhMU2E4VBbYeOqIQlyy v3dglMiwZKCiMJSsbuv0N9WmOBUk7zGbwi+XcZzH1kw/vA0uD0yLtfL10vmtzDm2Vdoz vQng== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 63si3443524edn.339.2020.12.10.11.41.54; Thu, 10 Dec 2020 11:41:54 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404263AbgLJThv (ORCPT + 14 others); Thu, 10 Dec 2020 14:37:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:36934 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390175AbgLJO2s (ORCPT ); Thu, 10 Dec 2020 09:28:48 -0500 From: Greg Kroah-Hartman Authentication-Results: mail.kernel.org; dkim=permerror (bad message/signature format) To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Ujfalusi , Nicolas Saenz Julienne , Mark Brown , Lukas Wunner Subject: [PATCH 4.4 33/39] spi: bcm2835: Release the DMA channel if probe fails after dma_init Date: Thu, 10 Dec 2020 15:26:44 +0100 Message-Id: <20201210142602.519963173@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201210142600.887734129@linuxfoundation.org> References: <20201210142600.887734129@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Peter Ujfalusi [ Upstream commit 666224b43b4bd4612ce3b758c038f9bc5c5e3fcb ] The DMA channel was not released if either devm_request_irq() or devm_spi_register_controller() failed. Signed-off-by: Peter Ujfalusi Reviewed-by: Nicolas Saenz Julienne Link: https://lore.kernel.org/r/20191212135550.4634-3-peter.ujfalusi@ti.com Signed-off-by: Mark Brown [lukas: backport to 4.19-stable] Signed-off-by: Lukas Wunner Signed-off-by: Greg Kroah-Hartman --- drivers/spi/spi-bcm2835.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c @@ -792,18 +792,19 @@ static int bcm2835_spi_probe(struct plat dev_name(&pdev->dev), master); if (err) { dev_err(&pdev->dev, "could not request IRQ: %d\n", err); - goto out_clk_disable; + goto out_dma_release; } err = spi_register_master(master); if (err) { dev_err(&pdev->dev, "could not register SPI master: %d\n", err); - goto out_clk_disable; + goto out_dma_release; } return 0; -out_clk_disable: +out_dma_release: + bcm2835_dma_release(master); clk_disable_unprepare(bs->clk); return err; }