1 files changed, 5 insertions, 4 deletions
diff --git a/os/kernel/src/chlists.c b/os/kernel/src/chlists.c
index 2d973e771..83bdf8b35 100644
--- a/os/kernel/src/chlists.c
+++ b/os/kernel/src/chlists.c
@@ -48,9 +48,9 @@ void prio_insert(Thread *tp, ThreadsQueue *tqp) {
     cp = cp->p_next;
     /* Not end of queue? and cp has equal or higher priority than tp?.*/
   } while ((cp != (Thread *)tqp) && (cp->p_prio >= tp->p_prio));
-  /* Insert before cp, point tp to next and prev in queue.*/
-  tp->p_prev = (tp->p_next = cp)->p_prev;
-  /* Make prev point to tp, and cp point back to tp.*/
+  /* Insertion on p_prev.*/
+  tp->p_next = cp;
+  tp->p_prev = cp->p_prev;
   tp->p_prev->p_next = cp->p_prev = tp;
 }
 
@@ -63,7 +63,8 @@ void prio_insert(Thread *tp, ThreadsQueue *tqp) {
  */
 void queue_insert(Thread *tp, ThreadsQueue *tqp) {
 
-  tp->p_prev = (tp->p_next = (Thread *)tqp)->p_prev;
+  tp->p_next = (Thread *)tqp;
+  tp->p_prev = tqp->p_prev;
   tp->p_prev->p_next = tqp->p_prev = tp;
 }