spi: lpspi: release requested DMA channels

[ Upstream commit f02bff30114f385d53ae3e45141db602923bca5d ]

The requested DMA channels are never released. Do this in .remove as well
as in .probe. spi_register_controller() can return -EPROBE_DEFER if
cs-gpios are not probed yet.

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Link: https://lore.kernel.org/r/20211109103134.184216-1-alexander.stein@ew.tq-group.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Stable-dep-of: 3b577de206d5 ("spi: spi-fsl-lpspi: Undo runtime PM changes at driver exit time")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/spi/spi-fsl-lpspi.c b/drivers/spi/spi-fsl-lpspi.c
index bc3e434ba2986ecbcfbd531c5a873f12f2ceeb35..314629b172281db5febbb34b216701fbb6ec4263 100644 (file)
--- a/drivers/spi/spi-fsl-lpspi.c
+++ b/drivers/spi/spi-fsl-lpspi.c
@@ -920,7 +920,7 @@ static int fsl_lpspi_probe(struct platform_device *pdev)
        ret = devm_spi_register_controller(&pdev->dev, controller);
        if (ret < 0) {
                dev_err_probe(&pdev->dev, ret, "spi_register_controller error: %i\n", ret);
-               goto out_pm_get;
+               goto free_dma;
        }
 
        pm_runtime_mark_last_busy(fsl_lpspi->dev);
@@ -928,6 +928,8 @@ static int fsl_lpspi_probe(struct platform_device *pdev)
 
        return 0;
 
+free_dma:
+       fsl_lpspi_dma_exit(controller);
 out_pm_get:
        pm_runtime_dont_use_autosuspend(fsl_lpspi->dev);
        pm_runtime_put_sync(fsl_lpspi->dev);
@@ -944,6 +946,8 @@ static int fsl_lpspi_remove(struct platform_device *pdev)
        struct fsl_lpspi_data *fsl_lpspi =
                                spi_controller_get_devdata(controller);
 
+       fsl_lpspi_dma_exit(controller);
+
        pm_runtime_disable(fsl_lpspi->dev);
        return 0;
 }