micropython
diff --git a/‎ports/zephyr/machine_pin.c
Lines changed: 10 additions & 11 deletions b/‎ports/zephyr/machine_pin.c
Lines changed: 10 additions & 11 deletions
@@ -59,7 +59,7 @@ void machine_pin_deinit(void) {
 }
 
 STATIC void gpio_callback_handler(struct device *port, struct gpio_callback *cb, gpio_port_pins_t pins) {
-    machine_pin_irq_obj_t *irq = (void *)((uintptr_t)cb - offsetof(machine_pin_irq_obj_t, callback));
+    machine_pin_irq_obj_t *irq = CONTAINER_OF(cb, machine_pin_irq_obj_t, callback);
 
     #if MICROPY_STACK_CHECK
     // This callback executes in an ISR context so the stack-limit check must be changed to
@@ -219,7 +219,7 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
             irq->base.handler = mp_const_none;
             irq->base.ishard = false;
             irq->next = MP_STATE_PORT(machine_pin_irq_list);
-            gpio_init_callback(&irq->callback, gpio_callback_handler, 0);
+            gpio_init_callback(&irq->callback, gpio_callback_handler, BIT(self->pin));
             int ret = gpio_add_callback(self->port, &irq->callback);
             if (ret != 0) {
                 mp_raise_OSError(-ret);
@@ -231,20 +231,19 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
 
     if (n_args > 1 || kw_args->used != 0) {
         // configure irq
-        self->irq->callback.pin_mask &= ~BIT(self->pin);
+        int ret = gpio_pin_interrupt_configure(self->port, self->pin, GPIO_INT_DISABLE);
+        if (ret != 0) {
+            mp_raise_OSError(-ret);
+        }
 
         self->irq->base.handler = args[ARG_handler].u_obj;
         self->irq->base.ishard = args[ARG_hard].u_bool;
 
-        int ret;
-        if (args[ARG_handler].u_obj == mp_const_none) {
-            ret = gpio_pin_interrupt_configure(self->port, self->pin, GPIO_INT_DISABLE);
-        } else {
+        if (args[ARG_handler].u_obj != mp_const_none) {
             ret = gpio_pin_interrupt_configure(self->port, self->pin, args[ARG_trigger].u_int);
-            self->irq->callback.pin_mask |= BIT(self->pin);
-        }
-        if (ret != 0) {
-            mp_raise_OSError(-ret);
+            if (ret != 0) {
+                mp_raise_OSError(-ret);
+            }
         }
     }