3 files changed, 12 insertions, 0 deletions

diff --git a/embassy-stm32/src/dma/bdma.rs b/embassy-stm32/src/dma/bdma.rs
index 4c26a9501..5063ec2e7 100644
--- a/embassy-stm32/src/dma/bdma.rs
+++ b/embassy-stm32/src/dma/bdma.rs
@@ -66,6 +66,11 @@ pub(crate) async unsafe fn do_transfer(
             w.set_en(false);
         });
         while ch.cr().read().en() {}
+
+        // Disabling the DMA mid transfer might cause some flags to be set, clear them all for the
+        // next transfer
+        dma.ifcr()
+            .write(|w| w.set_gif(channel_number as usize, true));
     });
 
     #[cfg(dmamux)]
diff --git a/embassy-stm32/src/dma/dma.rs b/embassy-stm32/src/dma/dma.rs
index 591279ef8..8634de205 100644
--- a/embassy-stm32/src/dma/dma.rs
+++ b/embassy-stm32/src/dma/dma.rs
@@ -67,6 +67,13 @@ pub(crate) async unsafe fn do_transfer(
             w.set_en(false);
         });
         while ch.cr().read().en() {}
+
+        // Disabling the DMA mid transfer might cause some flags to be set, clear them all for the
+        // next transfer
+        dma.ifcr(channel_number as usize / 4).write(|w| {
+            w.set_tcif(channel_number as usize % 4, true);
+            w.set_teif(channel_number as usize % 4, true);
+        });
     });
 
     #[cfg(dmamux)]
diff --git a/stm32-data b/stm32-data
-Subproject 8702a3a3bb83a59515dab2cf9f75952fa6edae8
+Subproject ce2e32b927a3637d975e780274b8e0c985f5d99