From 888cb09dff8c2ac2e1b9a995378018486b7ab8a2 Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Tue, 1 Mar 2022 10:56:14 +0100
Subject: [PATCH] sys/ztimer64: properly clear timer on removal

---
 sys/ztimer64/ztimer64.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/sys/ztimer64/ztimer64.c b/sys/ztimer64/ztimer64.c
index e1b8974c73..49079792c9 100644
--- a/sys/ztimer64/ztimer64.c
+++ b/sys/ztimer64/ztimer64.c
@@ -127,6 +127,12 @@ static int _add_entry_to_list(ztimer64_clock_t *clock, ztimer64_base_t *entry)
     }
 }
 
+static void _clear(ztimer64_base_t *entry)
+{
+    entry->next = NULL;
+    entry->target = 0;
+}
+
 static int _del_entry_from_list(ztimer64_clock_t *clock, ztimer64_base_t *entry)
 {
     DEBUG("_del_entry_from_list()\n");
@@ -137,7 +143,7 @@ static int _del_entry_from_list(ztimer64_clock_t *clock, ztimer64_base_t *entry)
     if (clock->first == entry) {
         /* special case: removing first entry */
         clock->first = entry->next;
-        entry->next = 0;
+        _clear(entry);
         return 1;
     }
     else {
@@ -151,7 +157,7 @@ static int _del_entry_from_list(ztimer64_clock_t *clock, ztimer64_base_t *entry)
             pos = pos->next;
         }
 
-        entry->next = 0;
+        _clear(entry);
 
         return 0;
     }
@@ -238,9 +244,9 @@ void ztimer64_handler(void *arg)
             ztimer64_t *timer = (ztimer64_t *)clock->first;
             /* remove timer from list */
             clock->first = clock->first->next;
+
             /* clear timer struct so it can be re-set */
-            timer->base.next = NULL;
-            timer->base.target = 0;
+            _clear(&timer->base);
 
             /* shoot callback */
             timer->callback(timer->arg);