diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2019-12-12 14:55:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-12-16 12:56:27 +0100 |
| commit | 666224b43b4bd4612ce3b758c038f9bc5c5e3fcb (patch) | |
| tree | 3c88b1814317df7f7f35ddd1670bc9a9a472f928 /drivers/spi/spi-bcm2835.c | |
| parent | spi: atmel: Use dma_request_chan() instead dma_request_slave_channel() (diff) | |
| download | linux-666224b43b4bd4612ce3b758c038f9bc5c5e3fcb.tar.xz linux-666224b43b4bd4612ce3b758c038f9bc5c5e3fcb.zip | |
spi: bcm2835: Release the DMA channel if probe fails after dma_init
The DMA channel was not released if either devm_request_irq() or
devm_spi_register_controller() failed.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Reviewed-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/20191212135550.4634-3-peter.ujfalusi@ti.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/spi/spi-bcm2835.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c index fb61a620effc..662d55e9f21d 100644 --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c @@ -1327,20 +1327,22 @@ static int bcm2835_spi_probe(struct platform_device *pdev) dev_name(&pdev->dev), ctlr); if (err) { dev_err(&pdev->dev, "could not request IRQ: %d\n", err); - goto out_clk_disable; + goto out_dma_release; } err = devm_spi_register_controller(&pdev->dev, ctlr); if (err) { dev_err(&pdev->dev, "could not register SPI controller: %d\n", err); - goto out_clk_disable; + goto out_dma_release; } bcm2835_debugfs_create(bs, dev_name(&pdev->dev)); return 0; +out_dma_release: + bcm2835_dma_release(ctlr, bs); out_clk_disable: clk_disable_unprepare(bs->clk); out_controller_put: |