1 files changed, 6 insertions, 3 deletions
diff --git a/os/hal/ports/STM32/LLD/QUADSPIv1/hal_qspi_lld.c b/os/hal/ports/STM32/LLD/QUADSPIv1/hal_qspi_lld.c
index 523a6471e..7e42b6ffb 100644
--- a/os/hal/ports/STM32/LLD/QUADSPIv1/hal_qspi_lld.c
+++ b/os/hal/ports/STM32/LLD/QUADSPIv1/hal_qspi_lld.c
@@ -77,12 +77,15 @@ static void qspi_lld_serve_dma_interrupt(QSPIDriver *qspip, uint32_t flags) {
  */
 static void qspi_lld_serve_interrupt(QSPIDriver *qspip) {
 
-  /* Stop everything.*/
-  dmaStreamDisable(qspip->dma);
-
   /* Portable QSPI ISR code defined in the high level driver, note, it is
      a macro.*/
   _qspi_isr_code(qspip);
+
+  /* Stop everything, we need to give DMA enough time to complete the ongoing
+     operation. Race condition hidden here.*/
+  while (dmaStreamGetTransactionSize(qspip->dma) > 0U)
+    ;
+  dmaStreamDisable(qspip->dma);
 }
 
 /*===========================================================================*/