diff --git a/os/hal/ports/STM32/LLD/DMAv1/stm32_dma.c b/os/hal/ports/STM32/LLD/DMAv1/stm32_dma.c
index 4c087b172..0abce47ab 100644
--- a/os/hal/ports/STM32/LLD/DMAv1/stm32_dma.c
+++ b/os/hal/ports/STM32/LLD/DMAv1/stm32_dma.c
@@ -582,7 +582,7 @@ const stm32_dma_stream_t *dmaStreamAllocI(uint32_t id,
   }
 #if STM32_DMA2_NUM_CHANNELS > 0
   else if (id == STM32_DMA_STREAM_ID_ANY_DMA2) {
-    startid = 7U;
+    startid = STM32_DMA1_NUM_CHANNELS;
     endid   = STM32_DMA_STREAMS - 1U;
   }
 #endif
diff --git a/os/hal/ports/STM32/LLD/DMAv1/stm32_dma.h b/os/hal/ports/STM32/LLD/DMAv1/stm32_dma.h
index 2b6612f55..54b6bde84 100644
--- a/os/hal/ports/STM32/LLD/DMAv1/stm32_dma.h
+++ b/os/hal/ports/STM32/LLD/DMAv1/stm32_dma.h
@@ -358,7 +358,7 @@ typedef struct {
  * @special
  */
 #define dmaStreamSetPeripheral(dmastp, addr) {                              \
-  (dmastp)->channel->CPAR  = (uint32_t)(addr);                              \
+  (dmastp)->channel->CPAR = (uint32_t)(addr);                               \
 }
 
 /**
@@ -373,7 +373,7 @@ typedef struct {
  * @special
  */
 #define dmaStreamSetMemory0(dmastp, addr) {                                 \
-  (dmastp)->channel->CMAR  = (uint32_t)(addr);                              \
+  (dmastp)->channel->CMAR = (uint32_t)(addr);                               \
 }
 
 /**
@@ -388,7 +388,7 @@ typedef struct {
  * @special
  */
 #define dmaStreamSetTransactionSize(dmastp, size) {                         \
-  (dmastp)->channel->CNDTR  = (uint32_t)(size);                             \
+  (dmastp)->channel->CNDTR = (uint32_t)(size);                              \
 }
 
 /**