This is an automated email from the ASF dual-hosted git repository.

xiaoxiang781216 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit 3582d5a04b197caf6c14085014cfe8e47e89beb4
Author: DuoYuWang <[email protected]>
AuthorDate: Mon Aug 31 15:33:37 2026 +0800

    sched/wqueue: use the uninterruptible wait helper
    
    Replace the local EINTR retry loop with
    nxsem_wait_uninterruptible().  This keeps the master implementation
    aligned with the semaphore API without changing cancellation behavior.
    
    Keep the cleanup separate so release branches where the helper is
    unavailable can use the lifecycle commit without a downstream
    compatibility patch.
    
    Assisted-by: Codex:GPT-5
    Signed-off-by: DuoYuWang <[email protected]>
---
 sched/wqueue/kwork_cancel.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/sched/wqueue/kwork_cancel.c b/sched/wqueue/kwork_cancel.c
index d18511ba68a..2329abaf708 100644
--- a/sched/wqueue/kwork_cancel.c
+++ b/sched/wqueue/kwork_cancel.c
@@ -48,7 +48,6 @@ static int work_qcancel(FAR struct kwork_wqueue_s *wqueue, 
bool sync,
 {
   irqstate_t flags;
   pid_t self = sync ? nxsched_gettid() : INVALID_PROCESS_ID;
-  int ret;
 
   if (wqueue == NULL || work == NULL)
     {
@@ -106,11 +105,7 @@ static int work_qcancel(FAR struct kwork_wqueue_s *wqueue, 
bool sync,
           return OK;
         }
 
-      do
-        {
-          ret = nxsem_wait(sync_wait);
-        }
-      while (ret == -EINTR);
+      nxsem_wait_uninterruptible(sync_wait);
     }
 }
 

Reply via email to