Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af160357 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Greg Kroah-Hartman
Browse files

spi: bcm2835: Release the DMA channel if probe fails after dma_init 



[ Upstream commit 666224b43b4bd4612ce3b758c038f9bc5c5e3fcb ]

The DMA channel was not released if either devm_request_irq() or
devm_spi_register_controller() failed.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Reviewed-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/20191212135550.4634-3-peter.ujfalusi@ti.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
[lukas: backport to 4.19-stable]
Signed-off-by: default avatarLukas Wunner <lukas@wunner.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2be1837b

drivers/spi/spi-bcm2835.c

+4 −3
Original line number Diff line number Diff line
@@ -787,18 +787,19 @@ static int bcm2835_spi_probe(struct platform_device *pdev) 
			       dev_name(&pdev->dev), master);

	if (err) {

		dev_err(&pdev->dev, "could not request IRQ: %d\n", err);

		goto out_clk_disable;

		goto out_dma_release;

	}



	err = spi_register_master(master);

	if (err) {

		dev_err(&pdev->dev, "could not register SPI master: %d\n", err);

		goto out_clk_disable;

		goto out_dma_release;

	}



	return 0;



out_clk_disable:

out_dma_release:

	bcm2835_dma_release(master);

	clk_disable_unprepare(bs->clk);

	return err;

}