From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 817B6C6369E for ; Tue, 27 Oct 2020 15:58:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 439AD20657 for ; Tue, 27 Oct 2020 15:58:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603814320; bh=Sz1MxoIX2bhhHXpza6QKvGLQfuaUSo/wFg+bSWNNUsU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OSTKMEi5wpqCTOKUXqgisMP5m/2XDfy+hrSbg725gH5/vHwZ+yjaFhqy0+Z3+BjOB DvRzOyeQkqfOKVWIHmAg/KDSfrKWWqS2m/DaWWWuQhNWQuvjW8d/1AlyLmEtUOuDzC JymfLvtcgSkq1ZqYoBV+smsUMjdqrgKng0Ak5MRw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1803842AbgJ0Px3 (ORCPT ); Tue, 27 Oct 2020 11:53:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:43100 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S368753AbgJ0P1V (ORCPT ); Tue, 27 Oct 2020 11:27:21 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 71C2D22202; Tue, 27 Oct 2020 15:27:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603812441; bh=Sz1MxoIX2bhhHXpza6QKvGLQfuaUSo/wFg+bSWNNUsU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y8YiEV1L3fZV7rSXMeffb+2sVQ2n4tXEru7N3TuFDC0jUs4hDUjNJUsz+bR1OI1UT neARdUG1sPY0mFuwinWNzNepPPcj/k/C4AKrrQ1i37ROBeb+HUxSYAQ8dlgCvqddzs 9zyOSXhtfJJ6LipCl6byV6uC+X2sVLWev3YKquSk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marek Vasut , Fabio Estevam , Mark Brown , NXP Linux Team , Robin Gong , Shawn Guo , Sasha Levin Subject: [PATCH 5.9 180/757] spi: imx: Fix freeing of DMA channels if spi_bitbang_start() fails Date: Tue, 27 Oct 2020 14:47:10 +0100 Message-Id: <20201027135459.032020313@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marek Vasut [ Upstream commit 45f0bbdafd26d6d772172563b30bff561cec9133 ] If the SPI controller has has_dmamode = true and spi_bitbang_start() fails in spi_imx_probe(), then the driver must release the DMA channels acquired in spi_imx_sdma_init() by calling spi_imx_sdma_exit() in the fail path. Fixes: f62caccd12c1 ("spi: spi-imx: add DMA support") Signed-off-by: Marek Vasut Cc: Fabio Estevam Cc: Mark Brown Cc: NXP Linux Team Cc: Robin Gong Cc: Shawn Guo Link: https://lore.kernel.org/r/20201005132229.513119-1-marex@denx.de Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-imx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index 38a5f1304cec4..e38e5ad3c7068 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -1707,7 +1707,7 @@ static int spi_imx_probe(struct platform_device *pdev) ret = spi_bitbang_start(&spi_imx->bitbang); if (ret) { dev_err(&pdev->dev, "bitbang start failed with %d\n", ret); - goto out_runtime_pm_put; + goto out_bitbang_start; } dev_info(&pdev->dev, "probed\n"); @@ -1717,6 +1717,9 @@ static int spi_imx_probe(struct platform_device *pdev) return ret; +out_bitbang_start: + if (spi_imx->devtype_data->has_dmamode) + spi_imx_sdma_exit(spi_imx); out_runtime_pm_put: pm_runtime_dont_use_autosuspend(spi_imx->dev); pm_runtime_put_sync(spi_imx->dev); -- 2.25.1