1 files changed, 7 insertions, 5 deletions
diff --git a/cpukit/score/src/threadqextractpriority.c b/cpukit/score/src/threadqextractpriority.c
index 724652ae8a..2f2555be33 100644
--- a/cpukit/score/src/threadqextractpriority.c
+++ b/cpukit/score/src/threadqextractpriority.c
@@ -24,8 +24,9 @@
 #include <rtems/score/threadimpl.h>
 #include <rtems/score/watchdogimpl.h>
 
-bool _Thread_queue_Extract_priority_helper(
+void _Thread_queue_Extract_priority_helper(
   Thread_Control       *the_thread,
+  uint32_t              return_code,
   bool                  requeuing
 )
 {
@@ -44,7 +45,7 @@ bool _Thread_queue_Extract_priority_helper(
   _ISR_Disable( level );
   if ( !_States_Is_waiting_on_thread_queue( the_thread->current_state ) ) {
     _ISR_Enable( level );
-    return false;
+    return;
   }
 
   /*
@@ -86,9 +87,12 @@ bool _Thread_queue_Extract_priority_helper(
 
   if ( requeuing ) {
     _ISR_Enable( level );
-    return true;
+    return;
   }
 
+  the_thread->Wait.queue = NULL;
+  the_thread->Wait.return_code = return_code;
+
   if ( !_Watchdog_Is_active( &the_thread->Timer ) ) {
     _ISR_Enable( level );
   } else {
@@ -102,6 +106,4 @@ bool _Thread_queue_Extract_priority_helper(
   if ( !_Objects_Is_local_id( the_thread->Object.id ) )
     _Thread_MP_Free_proxy( the_thread );
 #endif
-
-  return true;
 }