spi: bcm2835: Release the DMA channel if probe fails after dma_init (666224b4) · Commits · 戴 / test

The DMA channel was not released if either devm_request_irq() or devm_spi_register_controller() failed. Signed-off-by:

drivers/spi/spi-bcm2835.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -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: