Skip to contentSkip to conversation

Backport 666224b43b4b to 4.19-stable

PATCH Lukas Wunner 1 participant 1 message Dec 5, 2020

Subsystems (4)
Stable branch SPI Broadcom BCM2711/BCM2835 Arm architecture Broadcom BCM281XX/BCM11XXX/BCM216XX Arm architecture
lore
Share & tools
lore

Lukas Wunner

author
#0 lore raw

Hi Greg,

commit 666224b43b4b ("spi: bcm2835: Release the DMA channel if probe fails after dma_init") was not marked for stable but really should have been. Here's a backport for 4.19:

-- >8 --
From: Peter Ujfalusi <[email protected]>
Date: Thu, 12 Dec 2019 15:55:43 +0200
Subject: [PATCH] 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 Peter Ujfalusi <[email protected]>
Reviewed-by Nicolas Saenz Julienne <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Mark Brown <[email protected]>
[lukas: backport to 4.19-stable]
Signed-off-by Lukas Wunner <[email protected]>
---
 drivers/spi/spi-bcm2835.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/spi/spi-bcm2835.c +4 -3
index 2908df35466f..6824beae18e4 100644
@@ -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;
 }
Signature · 1 line
2.29.2