deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #126 from rgrr/master

Browse source 
Bug fix: add_timer() does not set owning process
This commit is contained in:
Adam Dunkels 2013-03-09 05:48:14 -08:00
parent e91a2ac78a ae62a0d142
commit dd3a88e1bf
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/sys/etimer.c
View file

@ -155,17 +155,17 @@ add_timer(struct etimer *timer)
etimer_request_poll(); etimer_request_poll();
if(timer->p != PROCESS_NONE) { if(timer->p != PROCESS_NONE) {
/* Timer not on list. */
for(t = timerlist; t != NULL; t = t->next) { for(t = timerlist; t != NULL; t = t->next) {
if(t == timer) { if(t == timer) {
/* Timer already on list, bail out. */ /* Timer already on list, bail out. */
timer->p = PROCESS_CURRENT();
update_time(); update_time();
return; return;
} }
} }
} }
/* Timer not on list. */
timer->p = PROCESS_CURRENT(); timer->p = PROCESS_CURRENT();
timer->next = timerlist; timer->next = timerlist;
timerlist = timer; timerlist = timer;