From e020bb8b6c0f0222bf6a758f4ac333829e5b0ab1 Mon Sep 17 00:00:00 2001
From: Naoki Iwakami <naoki.iwakami@gmail.com>
Date: Thu, 19 Jun 2025 19:37:03 +0000
Subject: [PATCH] Fix issues found by tests

---
 wiringPi/wiringPi.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
index 341d6df..aa165ce 100644
--- a/wiringPi/wiringPi.c
+++ b/wiringPi/wiringPi.c
@@ -2876,11 +2876,10 @@ int waitForInterruptClose(int pin) {
  *********************************************************************************
  */
 
-static int interruptHandlerInit(int pin)
+static int interruptHandlerInit(int pin, int EdgeMode, unsigned long debounce_period_us)
 {
   const char* strmode = "";
-  int EdgeMode, ret, attr;
-  unsigned long debounce_period_us;
+  int ret, attr;
   struct gpio_v2_line_config config;
   struct gpio_v2_line_request req;
 
@@ -2888,9 +2887,6 @@ static int interruptHandlerInit(int pin)
     return -1;
   }
 
-  EdgeMode = isrEdgeMode[pin];
-  debounce_period_us = isrDebouncePeriodUs[pin];
-
   if (wiringPiDebug) {
     printf ("interruptHandlerV2: GPIO line %d, edge mode %d, debounce_period_us %lu \n", pin, EdgeMode, debounce_period_us) ;
   }
@@ -3087,15 +3083,9 @@ int wiringPiISRInternal(int pin, int edgeMode, void (*function)(struct WPIWfiSta
     printf("wiringPi: wiringPiISR pin %d, edgeMode %d\n", pin, edgeMode);
   }
   if (isrFunctions[pin] || isrFunctionsV2[pin]) {
-    fprintf(stderr, "wiringPi: ISR function already active, ignoring \n");
+    fprintf(stderr, "wiringPi: ISR function already active\n");
   }
 
-  isrFunctionsV2[pin] = function;
-  isrUserdata[pin] = userdata;
-  isrFunctions[pin] = functionClassic;
-  isrEdgeMode[pin] = edgeMode;
-  isrDebouncePeriodUs[pin] = debounce_period_us;
-
   if (wiringPiDebug) {
     printf("wiringPi: mutex in\n");
   }
@@ -3103,12 +3093,19 @@ int wiringPiISRInternal(int pin, int edgeMode, void (*function)(struct WPIWfiSta
     struct interrupt_handler_params params = {
       .pin = pin,
     };
-    params.fd = interruptHandlerInit(pin);
+    params.fd = interruptHandlerInit(pin, edgeMode, debounce_period_us);
     if (params.fd < 0) {
       pthread_mutex_unlock (&pinMutex) ;
       return -1;
     }
 
+    // OK to start the new ISR. Update the table.
+    isrFunctionsV2[pin] = function;
+    isrUserdata[pin] = userdata;
+    isrFunctions[pin] = functionClassic;
+    isrEdgeMode[pin] = edgeMode;
+    isrDebouncePeriodUs[pin] = debounce_period_us;
+
     pinPass = pin ;
     if (params.fd > 0) {
       if (wiringPiDebug) {