Merge tag 'v5.10-rc1' into spi-5.10

[platform/kernel/linux-starfive.git] / drivers / spi / spi-imx.c

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 95be1b2..4b80e27 100644 (file)
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -1712,7 +1712,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;
        }
 
        pm_runtime_mark_last_busy(spi_imx->dev);
@@ -1720,6 +1720,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_set_suspended(&pdev->dev);