Skip to content

Commit 45f0bbd

Browse files
Marek Vasutbroonie
authored andcommitted
spi: imx: Fix freeing of DMA channels if spi_bitbang_start() fails
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: f62cacc ("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>
1 parent 1c33524 commit 45f0bbd

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/spi/spi-imx.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1707,7 +1707,7 @@ static int spi_imx_probe(struct platform_device *pdev)
17071707
ret = spi_bitbang_start(&spi_imx->bitbang);
17081708
if (ret) {
17091709
dev_err(&pdev->dev, "bitbang start failed with %d\n", ret);
1710-
goto out_runtime_pm_put;
1710+
goto out_bitbang_start;
17111711
}
17121712

17131713
dev_info(&pdev->dev, "probed\n");
@@ -1717,6 +1717,9 @@ static int spi_imx_probe(struct platform_device *pdev)
17171717

17181718
return ret;
17191719

1720+
out_bitbang_start:
1721+
if (spi_imx->devtype_data->has_dmamode)
1722+
spi_imx_sdma_exit(spi_imx);
17201723
out_runtime_pm_put:
17211724
pm_runtime_dont_use_autosuspend(spi_imx->dev);
17221725
pm_runtime_put_sync(spi_imx->dev);

0 commit comments

Comments
 (0)