1 files changed, 18 insertions, 9 deletions
diff --git a/os/hal/ports/STM32/STM32F0xx/ext_lld_isr.c b/os/hal/ports/STM32/STM32F0xx/ext_lld_isr.c
index 15295cbbe..3b9dfbc13 100644
--- a/os/hal/ports/STM32/STM32F0xx/ext_lld_isr.c
+++ b/os/hal/ports/STM32/STM32F0xx/ext_lld_isr.c
@@ -58,7 +58,8 @@ OSAL_IRQ_HANDLER(Vector54) {
 
   OSAL_IRQ_PROLOGUE();
 
-  pr = EXTI->PR & ((1U << 0) | (1U << 1));
+  pr = EXTI->PR;
+  pr &= ((1U << 0) | (1U << 1));
   EXTI->PR = pr;
   if (pr & (1U << 0))
     EXTD1.config->channels[0].cb(&EXTD1, 0);
@@ -78,7 +79,8 @@ OSAL_IRQ_HANDLER(Vector58) {
 
   OSAL_IRQ_PROLOGUE();
 
-  pr = EXTI->PR & ((1U << 2) | (1U << 3));
+  pr = EXTI->PR;
+  pr &= ((1U << 2) | (1U << 3));
   EXTI->PR = pr;
   if (pr & (1U << 2))
     EXTD1.config->channels[2].cb(&EXTD1, 2);
@@ -98,9 +100,10 @@ OSAL_IRQ_HANDLER(Vector5C) {
 
   OSAL_IRQ_PROLOGUE();
 
-  pr = EXTI->PR & ((1U << 4)  | (1U << 5)  | (1U << 6)  | (1U << 7)  | (1U << 8)  |
-                   (1U << 9)  | (1U << 10) | (1U << 11) | (1U << 12) | (1U << 13) |
-                   (1U << 14) | (1U << 15));
+  pr = EXTI->PR;
+  pr &= ((1U << 4)  | (1U << 5)  | (1U << 6)  | (1U << 7)  | (1U << 8)  |
+         (1U << 9)  | (1U << 10) | (1U << 11) | (1U << 12) | (1U << 13) |
+         (1U << 14) | (1U << 15));
   EXTI->PR = pr;
   if (pr & (1U << 4))
     EXTD1.config->channels[4].cb(&EXTD1, 4);
@@ -137,11 +140,15 @@ OSAL_IRQ_HANDLER(Vector5C) {
  * @isr
  */
 OSAL_IRQ_HANDLER(Vector44) {
+  uint32_t pr;
 
   OSAL_IRQ_PROLOGUE();
 
-  EXTI->PR = (1U << 16);
-  EXTD1.config->channels[16].cb(&EXTD1, 16);
+  pr = EXTI->PR;
+  pr &= EXTI->IMR & (1U << 16);
+  EXTI->PR = pr;
+  if (pr & (1U << 16))
+    EXTD1.config->channels[16].cb(&EXTD1, 16);
 
   OSAL_IRQ_EPILOGUE();
 }
@@ -158,7 +165,8 @@ OSAL_IRQ_HANDLER(Vector48) {
 
   OSAL_IRQ_PROLOGUE();
 
-  pr = EXTI->PR & EXTI->IMR & ((1U << 17) | (1U << 19) | (1U << 20));
+  pr = EXTI->PR;
+  pr &= EXTI->IMR & ((1U << 17) | (1U << 19) | (1U << 20));
   EXTI->PR = pr;
   if (pr & (1U << 17))
     EXTD1.config->channels[17].cb(&EXTD1, 17);
@@ -190,7 +198,8 @@ OSAL_IRQ_HANDLER(Vector70) {
   {
     uint32_t pr;
 
-    pr = EXTI->PR & EXTI->IMR & ((1U << 21) | (1U << 22));
+    pr = EXTI->PR;
+    pr &= EXTI->IMR & ((1U << 21) | (1U << 22));
     EXTI->PR = pr;
     if (pr & (1U << 21))
       EXTD1.config->channels[21].cb(&EXTD1, 21);