Merge pull request #1193 from LudwigOrtmann/issue-924

core/hwtimer: disable interrupts in hwtimer_remove
9 years ago · 5808662d05
parent 1e12d5896b 9d4a92003c
commit 5808662d05
1 changed files with 4 additions and 2 deletions
--- a/core/hwtimer.c
+++ b/core/hwtimer.c
@ -202,7 +202,8 @@ int hwtimer_set_absolute(unsigned long offset, void (*callback)(void*), void *pt
 int hwtimer_remove(int n)
 {
    DEBUG("hwtimer_remove n=%d\n", n);
-    hwtimer_arch_disable_interrupt();
+
+    int state = disableIRQ();
    hwtimer_arch_unset(n);

    lifo_insert(lifo, n);
@ -210,6 +211,7 @@ int hwtimer_remove(int n)

    lpm_prevent_sleep--;

-    hwtimer_arch_enable_interrupt();
+    restoreIRQ(state);
+
    return 1;
 }