spi: lpspi: release requested DMA channels
authorAlexander Stein <alexander.stein@ew.tq-group.com>
Tue, 9 Nov 2021 10:31:34 +0000 (11:31 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 15 Nov 2021 13:27:16 +0000 (13:27 +0000)
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>
drivers/spi/spi-fsl-lpspi.c

index c72e501c270fd8156a38d8c64d885f7914cd1cbb..4c601294f8faba2225ed9e28967712a2af425a86 100644 (file)
@@ -913,7 +913,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);
@@ -921,6 +921,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);
@@ -937,6 +939,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;
 }