diff --git a/examples/cc3000/telnetd_daemon.c b/examples/cc3000/telnetd_daemon.c
index 5edeb269b..eb908744b 100644
--- a/examples/cc3000/telnetd_daemon.c
+++ b/examples/cc3000/telnetd_daemon.c
@@ -338,7 +338,7 @@ int telnetd_start(FAR struct telnetd_config_s *config)
 
       if (ret < 0)
         {
-          DEBUGASSERT(errno == -EINTR);
+          DEBUGASSERT(errno == EINTR || errno  == ECANCELED);
         }
     }
   while (ret < 0);
diff --git a/examples/cpuhog/cpuhog_main.c b/examples/cpuhog/cpuhog_main.c
index 395a1b836..4adc8b2b2 100644
--- a/examples/cpuhog/cpuhog_main.c
+++ b/examples/cpuhog/cpuhog_main.c
@@ -121,7 +121,7 @@ int cpuhog_main(int argc, char *argv[])
 
       while (sem_wait(&g_state.sem) != 0)
         {
-          ASSERT(errno == EINTR);
+          ASSERT(errno == EINTR || errno == ECANCELED);
         }
 
       /* Burn some inside semlock */
diff --git a/fsutils/passwd/passwd_lock.c b/fsutils/passwd/passwd_lock.c
index a4dee9ae6..c92f7f04e 100644
--- a/fsutils/passwd/passwd_lock.c
+++ b/fsutils/passwd/passwd_lock.c
@@ -113,7 +113,7 @@ int passwd_lock(FAR sem_t **semp)
   while (sem_wait(sem) < 0)
     {
       int errcode = errno;
-      DEBUGASSERT(errcode == EINTR);
+      DEBUGASSERT(errcode == EINTR || errcode == ECANCELED);
       UNUSED(errcode);
     }
 
diff --git a/netutils/telnetd/telnetd_daemon.c b/netutils/telnetd/telnetd_daemon.c
index c8aabf263..b8ab6445c 100644
--- a/netutils/telnetd/telnetd_daemon.c
+++ b/netutils/telnetd/telnetd_daemon.c
@@ -461,7 +461,7 @@ int telnetd_start(FAR struct telnetd_config_s *config)
 
       if (ret < 0)
         {
-          DEBUGASSERT(errno == -EINTR);
+          DEBUGASSERT(errno == EINTR || errno  == ECANCELED);
         }
     }
   while (ret < 0);
diff --git a/netutils/thttpd/thttpd_cgi.c b/netutils/thttpd/thttpd_cgi.c
index 8ee999251..84901a9cb 100644
--- a/netutils/thttpd/thttpd_cgi.c
+++ b/netutils/thttpd/thttpd_cgi.c
@@ -153,7 +153,7 @@ static inline void cgi_semtake(void)
        * awakened by a signal.
        */
 
-      ASSERT(errno == EINTR);
+      ASSERT(errno == EINTR || errno == ECANCELED);
     }
 }