Commit f02bff30 authored by Alexander Stein's avatar Alexander Stein Committed by Mark Brown

spi: lpspi: release requested DMA channels

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: default avatarAlexander Stein <alexander.stein@ew.tq-group.com>
Link: https://lore.kernel.org/r/20211109103134.184216-1-alexander.stein@ew.tq-group.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 45971bdd
...@@ -913,7 +913,7 @@ static int fsl_lpspi_probe(struct platform_device *pdev) ...@@ -913,7 +913,7 @@ static int fsl_lpspi_probe(struct platform_device *pdev)
ret = devm_spi_register_controller(&pdev->dev, controller); ret = devm_spi_register_controller(&pdev->dev, controller);
if (ret < 0) { if (ret < 0) {
dev_err_probe(&pdev->dev, ret, "spi_register_controller error: %i\n", ret); 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); pm_runtime_mark_last_busy(fsl_lpspi->dev);
...@@ -921,6 +921,8 @@ static int fsl_lpspi_probe(struct platform_device *pdev) ...@@ -921,6 +921,8 @@ static int fsl_lpspi_probe(struct platform_device *pdev)
return 0; return 0;
free_dma:
fsl_lpspi_dma_exit(controller);
out_pm_get: out_pm_get:
pm_runtime_dont_use_autosuspend(fsl_lpspi->dev); pm_runtime_dont_use_autosuspend(fsl_lpspi->dev);
pm_runtime_put_sync(fsl_lpspi->dev); pm_runtime_put_sync(fsl_lpspi->dev);
...@@ -937,6 +939,8 @@ static int fsl_lpspi_remove(struct platform_device *pdev) ...@@ -937,6 +939,8 @@ static int fsl_lpspi_remove(struct platform_device *pdev)
struct fsl_lpspi_data *fsl_lpspi = struct fsl_lpspi_data *fsl_lpspi =
spi_controller_get_devdata(controller); spi_controller_get_devdata(controller);
fsl_lpspi_dma_exit(controller);
pm_runtime_disable(fsl_lpspi->dev); pm_runtime_disable(fsl_lpspi->dev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment