lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 180/757] spi: imx: Fix freeing of DMA channels if spi_bitbang_start() fails
    Date
    From: Marek Vasut <marex@denx.de>

    [ 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 <marex@denx.de>
    Cc: Fabio Estevam <festevam@gmail.com>
    Cc: Mark Brown <broonie@kernel.org>
    Cc: NXP Linux Team <linux-imx@nxp.com>
    Cc: Robin Gong <b38343@freescale.com>
    Cc: Shawn Guo <shawnguo@kernel.org>
    Link: https://lore.kernel.org/r/20201005132229.513119-1-marex@denx.de
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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


    \
     
     \ /
      Last update: 2020-10-27 17:11    [W:3.969 / U:0.328 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site