1 files changed, 2 insertions, 1 deletions

diff --git a/src/atimer.c b/src/atimer.c
index eafe0f5ebf6..a05498ba845 100644
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -176,7 +176,7 @@ cancel_atimer (timer)
       struct atimer **list = i ? &stopped_atimers : &atimers;
       
       /* See if TIMER is active or stopped.  */
-      for (t = *list, prev = 0; t && t != timer; t = t->next)
+      for (t = *list, prev = NULL; t && t != timer; prev = t, t = t->next)
         ;
 
       /* If it is, take it off the its list, and put in on the
@@ -191,6 +191,7 @@ cancel_atimer (timer)
           
           t->next = free_atimers;
           free_atimers = t;
+          break;
         }
     }