Skip to contentSkip to conversation

check if dma is active before attempting to terminate

PATCH In review Jens Lindahl 3 participants 3 messages Jun 3, 2022 – Jun 6, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 check if dma is active before attempting to terminate

---
 drivers/spi/spi-bcm2835.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/spi/spi-bcm2835.c +8 -4
index 775c0bf2f..84e72b8dd 100644
@@ -1138,10 +1138,14 @@ static void bcm2835_spi_handle_err(struct spi_controller *ctlr,
 	struct bcm2835_spi *bs = spi_controller_get_devdata(ctlr);
 
 	/* if an error occurred and we have an active dma, then terminate */
-	dmaengine_terminate_sync(ctlr->dma_tx);
-	bs->tx_dma_active = false;
-	dmaengine_terminate_sync(ctlr->dma_rx);
-	bs->rx_dma_active = false;
+	if (bs->tx_dma_active) {
+		dmaengine_terminate_sync(ctlr->dma_tx);
+		bs->tx_dma_active = false;
+	}
+	if (bs->rx_dma_active) {
+		dmaengine_terminate_sync(ctlr->dma_rx);
+		bs->rx_dma_active = false;
+	}
 	bcm2835_spi_undo_prologue(bs);
 
 	/* and reset */
Signature · 1 line
2.20.1 (Apple Git-117)
maintainer
#2 lore raw
Quoted 10 lines · Florian Fainelli
Quoted 3 lines · Jens Lindahl
---
  drivers/spi/spi-bcm2835.c | 12 ++++++++----
  1 file changed, 8 insertions(+), 4 deletions(-)

Your patch looks reasonable but is not properly formed:

https://www.kernel.org/doc/html/latest/process/submitting-patches.html

In particular:

You've not provided a Signed-off-by for this so I can't do anything with it, please see Documentation/process/submitting-patches.rst for details on what this is and why it's important.