diff --git a/arch/arm/src/lpc43xx/lpc43_sdmmc.c b/arch/arm/src/lpc43xx/lpc43_sdmmc.c
index a84c6b8de9..6425bf87b0 100644
--- a/arch/arm/src/lpc43xx/lpc43_sdmmc.c
+++ b/arch/arm/src/lpc43xx/lpc43_sdmmc.c
@@ -519,7 +519,7 @@ static void lpc43_takesem(struct lpc43_dev_s *priv)
        * awakened by a signal.
        */
 
-      DEBUGASSERT(errno == EINTR);
+      DEBUGASSERT(errno == EINTR || errno == ECANCELED);
     }
 }
 
diff --git a/arch/arm/src/lpc54xx/lpc54_sdmmc.c b/arch/arm/src/lpc54xx/lpc54_sdmmc.c
index 292732040d..8a5a5b9f47 100644
--- a/arch/arm/src/lpc54xx/lpc54_sdmmc.c
+++ b/arch/arm/src/lpc54xx/lpc54_sdmmc.c
@@ -523,7 +523,7 @@ static void lpc54_takesem(struct lpc54_dev_s *priv)
        * awakened by a signal.
        */
 
-      DEBUGASSERT(errno == EINTR);
+      DEBUGASSERT(errno == EINTR || errno == ECANCELED);
     }
 }
 
diff --git a/arch/arm/src/sama5/sam_tsd.c b/arch/arm/src/sama5/sam_tsd.c
index 15c96f7f8a..887207c384 100644
--- a/arch/arm/src/sama5/sam_tsd.c
+++ b/arch/arm/src/sama5/sam_tsd.c
@@ -393,7 +393,7 @@ static int sam_tsd_waitsample(struct sam_tsd_s *priv, struct sam_sample_s *sampl
            */
 
           ierr("ERROR: nxsem_wait: %d\n", ret);
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret  == -ECANCELED);
           goto errout;
         }
     }
diff --git a/arch/sim/src/up_touchscreen.c b/arch/sim/src/up_touchscreen.c
index 7e5d4a255d..f08ca56a0a 100644
--- a/arch/sim/src/up_touchscreen.c
+++ b/arch/sim/src/up_touchscreen.c
@@ -321,7 +321,7 @@ static int up_waitsample(FAR struct up_dev_s *priv,
            * the failure now.
            */
 
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret  == -ECANCELED);
           goto errout;
         }
     }
@@ -411,7 +411,7 @@ static ssize_t up_read(FAR struct file *filep, FAR char *buffer, size_t len)
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret  == -ECANCELED);
       return ret;
     }
 
@@ -509,7 +509,7 @@ static int up_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret  == -ECANCELED);
       return ret;
     }
 
@@ -553,7 +553,7 @@ static int up_poll(FAR struct file *filep, FAR struct pollfd *fds,
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret  == -ECANCELED);
       return ret;
     }
 
@@ -815,4 +815,3 @@ int up_buttonevent(int x, int y, int buttons)
   up_notify(priv);
   return OK;
 }
-
diff --git a/configs/mikroe-stm32f4/src/stm32_touchscreen.c b/configs/mikroe-stm32f4/src/stm32_touchscreen.c
index 7273285db9..d11a9b8cd1 100644
--- a/configs/mikroe-stm32f4/src/stm32_touchscreen.c
+++ b/configs/mikroe-stm32f4/src/stm32_touchscreen.c
@@ -718,7 +718,7 @@ static int tc_waitsample(FAR struct tc_dev_s *priv,
            * the failure now.
            */
 
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret  == -ECANCELED);
           goto errout;
         }
     }
@@ -1131,7 +1131,7 @@ static int tc_open(FAR struct file *filep)
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret  == -ECANCELED);
       return ret;
     }
 
@@ -1186,7 +1186,7 @@ static int tc_close(FAR struct file *filep)
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret  == -ECANCELED);
       return ret;
     }
 
@@ -1243,7 +1243,7 @@ static ssize_t tc_read(FAR struct file *filep, FAR char *buffer, size_t len)
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1355,7 +1355,7 @@ static int tc_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1402,7 +1402,7 @@ static int tc_poll(FAR struct file *filep, FAR struct pollfd *fds,
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
diff --git a/configs/pic32mx7mmb/src/pic32_touchscreen.c b/configs/pic32mx7mmb/src/pic32_touchscreen.c
index 82e1a91b37..6e0d5219c5 100644
--- a/configs/pic32mx7mmb/src/pic32_touchscreen.c
+++ b/configs/pic32mx7mmb/src/pic32_touchscreen.c
@@ -604,7 +604,7 @@ static int tc_waitsample(FAR struct tc_dev_s *priv,
            * the failure now.
            */
 
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
           goto errout;
         }
     }
@@ -1000,7 +1000,7 @@ static int tc_open(FAR struct file *filep)
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1055,7 +1055,7 @@ static int tc_close(FAR struct file *filep)
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1112,7 +1112,7 @@ static ssize_t tc_read(FAR struct file *filep, FAR char *buffer, size_t len)
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1224,7 +1224,7 @@ static int tc_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1271,7 +1271,7 @@ static int tc_poll(FAR struct file *filep, FAR struct pollfd *fds,
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
diff --git a/drivers/eeprom/i2c_xx24xx.c b/drivers/eeprom/i2c_xx24xx.c
index 944e14e856..2a6ed85660 100644
--- a/drivers/eeprom/i2c_xx24xx.c
+++ b/drivers/eeprom/i2c_xx24xx.c
@@ -311,7 +311,7 @@ static void ee24xx_semtake(FAR struct ee24xx_dev_s *eedev)
        * the wait was awakened by a signal.
        */
 
-      DEBUGASSERT(errno == EINTR);
+      DEBUGASSERT(errno == EINTR || errno == ECANCELED);
     }
 }
 
diff --git a/drivers/input/ads7843e.c b/drivers/input/ads7843e.c
index 225d33e765..b597d3aa46 100644
--- a/drivers/input/ads7843e.c
+++ b/drivers/input/ads7843e.c
@@ -768,7 +768,7 @@ static int ads7843e_open(FAR struct file *filep)
     {
       /* This should only happen if the wait was cancelled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -825,7 +825,7 @@ static int ads7843e_close(FAR struct file *filep)
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -886,7 +886,7 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le
       /* This should only happen if the wait was cancelled by an signal */
 
       ierr("ERROR: nxsem_wait: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -998,7 +998,7 @@ static int ads7843e_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
     {
       /* This should only happen if the wait was cancelled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1058,7 +1058,7 @@ static int ads7843e_poll(FAR struct file *filep, FAR struct pollfd *fds,
     {
       /* This should only happen if the wait was cancelled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
diff --git a/drivers/input/ft5x06.c b/drivers/input/ft5x06.c
index 0afc495662..4970cbbcb0 100644
--- a/drivers/input/ft5x06.c
+++ b/drivers/input/ft5x06.c
@@ -685,7 +685,7 @@ static ssize_t ft5x06_waitsample(FAR struct ft5x06_dev_s *priv,
            */
 
           ierr("ERROR: nxsem_wait failed: %d\n", ret);
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
           goto errout;
         }
     }
@@ -812,7 +812,7 @@ static int ft5x06_open(FAR struct file *filep)
       /* This should only happen if the wait was cancelled by an signal */
 
       ierr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -874,7 +874,7 @@ static int ft5x06_close(FAR struct file *filep)
       /* This should only happen if the wait was cancelled by an signal */
 
       ierr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -938,7 +938,7 @@ static ssize_t ft5x06_read(FAR struct file *filep, FAR char *buffer,
       /* This should only happen if the wait was cancelled by an signal */
 
       ierr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1001,7 +1001,7 @@ static int ft5x06_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
       /* This should only happen if the wait was cancelled by an signal */
 
       ierr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1062,7 +1062,7 @@ static int ft5x06_poll(FAR struct file *filep, FAR struct pollfd *fds,
       /* This should only happen if the wait was cancelled by an signal */
 
       ierr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
diff --git a/drivers/input/max11802.c b/drivers/input/max11802.c
index 435ea30d21..a1c7d74c35 100644
--- a/drivers/input/max11802.c
+++ b/drivers/input/max11802.c
@@ -395,7 +395,7 @@ static int max11802_waitsample(FAR struct max11802_dev_s *priv,
            */
 
           ierr("ERROR: nxsem_wait: %d\n", ret);
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
           goto errout;
         }
     }
@@ -773,7 +773,7 @@ static int max11802_open(FAR struct file *filep)
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -830,7 +830,7 @@ static int max11802_close(FAR struct file *filep)
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -892,7 +892,7 @@ static ssize_t max11802_read(FAR struct file *filep, FAR char *buffer,
       /* This should only happen if the wait was cancelled by an signal */
 
       ierr("ERROR: nxsem_wait: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1004,7 +1004,7 @@ static int max11802_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1064,7 +1064,7 @@ static int max11802_poll(FAR struct file *filep, FAR struct pollfd *fds,
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
diff --git a/drivers/input/mxt.c b/drivers/input/mxt.c
index 37a6467ffa..60f897e282 100644
--- a/drivers/input/mxt.c
+++ b/drivers/input/mxt.c
@@ -718,7 +718,7 @@ static inline int mxt_waitsample(FAR struct mxt_dev_s *priv)
            * the failure now.
            */
 
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
           goto errout;
         }
     }
@@ -1148,7 +1148,7 @@ static int mxt_open(FAR struct file *filep)
     {
       /* This should only happen if the wait was cancelled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1229,7 +1229,7 @@ static int mxt_close(FAR struct file *filep)
     {
       /* This should only happen if the wait was cancelled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1300,7 +1300,7 @@ static ssize_t mxt_read(FAR struct file *filep, FAR char *buffer, size_t len)
     {
       /* This should only happen if the wait was cancelled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1522,7 +1522,7 @@ static int mxt_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
     {
       /* This should only happen if the wait was cancelled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1583,7 +1583,7 @@ static int mxt_poll(FAR struct file *filep, FAR struct pollfd *fds,
     {
       /* This should only happen if the wait was cancelled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
diff --git a/drivers/input/stmpe811_tsc.c b/drivers/input/stmpe811_tsc.c
index 42c374c5b0..b6838f8a24 100644
--- a/drivers/input/stmpe811_tsc.c
+++ b/drivers/input/stmpe811_tsc.c
@@ -312,7 +312,7 @@ static inline int stmpe811_waitsample(FAR struct stmpe811_dev_s *priv,
            */
 
           ierr("ERROR: nxsem_wait failed: %d\n", ret);
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
           goto errout;
         }
     }
@@ -365,7 +365,7 @@ static int stmpe811_open(FAR struct file *filep)
       /* This should only happen if the wait was cancelled by an signal */
 
       ierr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -425,7 +425,7 @@ static int stmpe811_close(FAR struct file *filep)
       /* This should only happen if the wait was canceled by an signal */
 
       ierr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -488,7 +488,7 @@ static ssize_t stmpe811_read(FAR struct file *filep, FAR char *buffer, size_t le
       /* This should only happen if the wait was canceled by an signal */
 
       ierr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -603,7 +603,7 @@ static int stmpe811_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
       /* This should only happen if the wait was canceled by an signal */
 
       ierr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -668,7 +668,7 @@ static int stmpe811_poll(FAR struct file *filep, FAR struct pollfd *fds,
       /* This should only happen if the wait was canceled by an signal */
 
       ierr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -908,7 +908,7 @@ int stmpe811_register(STMPE811_HANDLE handle, int minor)
   if (ret < 0)
     {
       ierr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
diff --git a/drivers/input/tsc2007.c b/drivers/input/tsc2007.c
index fdaec44112..549e5a57de 100644
--- a/drivers/input/tsc2007.c
+++ b/drivers/input/tsc2007.c
@@ -388,7 +388,7 @@ static int tsc2007_waitsample(FAR struct tsc2007_dev_s *priv,
            */
 
           ierr("ERROR: nxsem_wait failed: %d\n", ret);
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
           goto errout;
         }
     }
@@ -822,7 +822,7 @@ static int tsc2007_open(FAR struct file *filep)
       /* This should only happen if the wait was cancelled by an signal */
 
       ierr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -878,7 +878,7 @@ static int tsc2007_close(FAR struct file *filep)
       /* This should only happen if the wait was cancelled by an signal */
 
       ierr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -936,7 +936,7 @@ static ssize_t tsc2007_read(FAR struct file *filep, FAR char *buffer, size_t len
       /* This should only happen if the wait was cancelled by an signal */
 
       ierr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1053,7 +1053,7 @@ static int tsc2007_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
       /* This should only happen if the wait was cancelled by an signal */
 
       ierr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1130,7 +1130,7 @@ static int tsc2007_poll(FAR struct file *filep, FAR struct pollfd *fds,
       /* This should only happen if the wait was cancelled by an signal */
 
       ierr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
diff --git a/drivers/leds/rgbled.c b/drivers/leds/rgbled.c
index 1bb4e89f72..f5a9910f70 100644
--- a/drivers/leds/rgbled.c
+++ b/drivers/leds/rgbled.c
@@ -139,7 +139,7 @@ static int rgbled_open(FAR struct file *filep)
   if (ret < 0)
     {
       lcderr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       goto errout;
     }
 
@@ -191,7 +191,7 @@ static int rgbled_close(FAR struct file *filep)
   if (ret < 0)
     {
       lcderr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       goto errout;
     }
 
diff --git a/drivers/mtd/mtd_config.c b/drivers/mtd/mtd_config.c
index 89c4a5bccd..973225505e 100644
--- a/drivers/mtd/mtd_config.c
+++ b/drivers/mtd/mtd_config.c
@@ -984,7 +984,7 @@ static int  mtdconfig_open(FAR struct file *filep)
   if (ret < 0)
     {
       ferr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       goto errout;
     }
 
diff --git a/drivers/net/telnet.c b/drivers/net/telnet.c
index db5419125d..6f4c18eb6f 100644
--- a/drivers/net/telnet.c
+++ b/drivers/net/telnet.c
@@ -510,7 +510,7 @@ static int telnet_open(FAR struct file *filep)
   if (ret < 0)
     {
       nerr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       goto errout;
     }
 
@@ -559,7 +559,7 @@ static int telnet_close(FAR struct file *filep)
   if (ret < 0)
     {
       nerr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       goto errout;
     }
 
diff --git a/drivers/sensors/adxl345_base.c b/drivers/sensors/adxl345_base.c
index 33079ed9c5..18f387f6aa 100644
--- a/drivers/sensors/adxl345_base.c
+++ b/drivers/sensors/adxl345_base.c
@@ -154,7 +154,7 @@ static ssize_t adxl345_read(FAR struct file *filep, FAR char *buffer, size_t len
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -210,7 +210,7 @@ int adxl345_register(ADXL345_HANDLE handle, int minor)
   if (ret < 0)
     {
       snerr("ERROR: nxsem_wait failed: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
diff --git a/drivers/sensors/bmg160.c b/drivers/sensors/bmg160.c
index b7cc35f8ed..f84b32592b 100644
--- a/drivers/sensors/bmg160.c
+++ b/drivers/sensors/bmg160.c
@@ -232,7 +232,7 @@ static void bmg160_read_measurement_data(FAR struct bmg160_dev_s *dev)
   if (ret < 0)
     {
       snerr("ERROR: Could not aquire dev->datasem: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return;
     }
 
@@ -462,7 +462,7 @@ static ssize_t bmg160_read(FAR struct file *filep, FAR char *buffer,
   if (ret < 0)
     {
       snerr("ERROR: Could not aquire priv->datasem: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
diff --git a/drivers/sensors/l3gd20.c b/drivers/sensors/l3gd20.c
index 17755e6c7e..c7c7add92c 100644
--- a/drivers/sensors/l3gd20.c
+++ b/drivers/sensors/l3gd20.c
@@ -511,7 +511,7 @@ static ssize_t l3gd20_read(FAR struct file *filep, FAR char *buffer,
   if (ret < 0)
     {
       snerr("ERROR: Could not aquire priv->datasem: %d\n", ret);
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
diff --git a/drivers/sensors/xen1210.c b/drivers/sensors/xen1210.c
index 0f3f84e198..e29cf8fb0c 100644
--- a/drivers/sensors/xen1210.c
+++ b/drivers/sensors/xen1210.c
@@ -179,7 +179,7 @@ static ssize_t xen1210_read(FAR struct file *filep, FAR char *buffer,
       /* This should only happen if the wait was canceled by an signal */
 
       snerr("Failed: Cannot get exclusive access to driver structure!\n");
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 8ec8350b8c..1f6ab0fad2 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -165,7 +165,7 @@ static int uart_takesem(FAR sem_t *sem, bool errout)
            * awakened by a signal.
            */
 
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
 
           /* When the signal is received, should we errout? Or should we just
            * continue waiting until we have the semaphore?
diff --git a/drivers/spi/spi_driver.c b/drivers/spi/spi_driver.c
index 9a1f19a4bb..d3a5d9e729 100644
--- a/drivers/spi/spi_driver.c
+++ b/drivers/spi/spi_driver.c
@@ -147,7 +147,7 @@ static int spidrvr_open(FAR struct file *filep)
   ret = nxsem_wait(&priv->exclsem);
   if (ret < 0)
     {
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -185,7 +185,7 @@ static int spidrvr_close(FAR struct file *filep)
   ret = nxsem_wait(&priv->exclsem);
   if (ret < 0)
     {
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -256,7 +256,7 @@ static int spidrvr_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   ret = nxsem_wait(&priv->exclsem);
   if (ret < 0)
     {
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -312,7 +312,7 @@ static int spidrvr_unlink(FAR struct inode *inode)
   ret = nxsem_wait(&priv->exclsem);
   if (ret < 0)
     {
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
diff --git a/drivers/usbhost/usbhost_hidmouse.c b/drivers/usbhost/usbhost_hidmouse.c
index 4648c3bdb3..f23d61fefc 100644
--- a/drivers/usbhost/usbhost_hidmouse.c
+++ b/drivers/usbhost/usbhost_hidmouse.c
@@ -1393,7 +1393,7 @@ static int usbhost_waitsample(FAR struct usbhost_state_s *priv,
            */
 
           ierr("ERROR: nxsem_wait: %d\n", ret);
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
           goto errout;
         }
 
diff --git a/drivers/usbhost/usbhost_xboxcontroller.c b/drivers/usbhost/usbhost_xboxcontroller.c
index 91b0b5093c..9d69d694bc 100644
--- a/drivers/usbhost/usbhost_xboxcontroller.c
+++ b/drivers/usbhost/usbhost_xboxcontroller.c
@@ -1005,7 +1005,7 @@ static int usbhost_waitsample(FAR struct usbhost_state_s *priv,
            */
 
           ierr("ERROR: nxsem_wait: %d\n", ret);
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
           goto errout;
         }
 
diff --git a/drivers/wireless/cc3000/cc3000.c b/drivers/wireless/cc3000/cc3000.c
index b04a8afa14..156bc5c684 100644
--- a/drivers/wireless/cc3000/cc3000.c
+++ b/drivers/wireless/cc3000/cc3000.c
@@ -1286,7 +1286,7 @@ static ssize_t cc3000_write(FAR struct file *filep, FAR const char *usrbuffer, s
 
           cc3000_deselect_and_unlock(priv->spi);
           ninfo("nxsem_wait: %d\n", ret);
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
           nwritten = ret;
           goto errout_without_sem;
         }
diff --git a/drivers/wireless/ieee802154/xbee/xbee.c b/drivers/wireless/ieee802154/xbee/xbee.c
index 3cd82479df..d6a7070371 100644
--- a/drivers/wireless/ieee802154/xbee/xbee.c
+++ b/drivers/wireless/ieee802154/xbee/xbee.c
@@ -1267,7 +1267,7 @@ int xbee_atquery(FAR struct xbee_priv_s *priv, FAR const char *atcommand)
   ret = nxsem_wait(&priv->atquery_sem);
   if (ret < 0)
     {
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1298,7 +1298,7 @@ int xbee_atquery(FAR struct xbee_priv_s *priv, FAR const char *atcommand)
       ret = nxsem_wait(&priv->atresp_sem);
       if (ret < 0)
         {
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
           wd_cancel(priv->atquery_wd);
           priv->querycmd[0] = 0;
           priv->querycmd[1] = 0;
diff --git a/drivers/wireless/ieee802154/xbee/xbee_netdev.c b/drivers/wireless/ieee802154/xbee/xbee_netdev.c
index 77e75e1187..35547021eb 100644
--- a/drivers/wireless/ieee802154/xbee/xbee_netdev.c
+++ b/drivers/wireless/ieee802154/xbee/xbee_netdev.c
@@ -1114,7 +1114,7 @@ static int xbeenet_ioctl(FAR struct net_driver_s *dev, int cmd,
                       ret = nxsem_wait(&priv->xd_eventsem);
                       if (ret < 0)
                         {
-                          DEBUGASSERT(ret == -EINTR);
+                          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
                           priv->xd_eventpending = false;
                           return ret;
                         }
diff --git a/drivers/wireless/nrf24l01.c b/drivers/wireless/nrf24l01.c
index 9b24aa39a7..fa341fb6cb 100644
--- a/drivers/wireless/nrf24l01.c
+++ b/drivers/wireless/nrf24l01.c
@@ -974,7 +974,7 @@ static int nrf24l01_open(FAR struct file *filep)
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1021,7 +1021,7 @@ static int nrf24l01_close(FAR struct file *filep)
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1057,7 +1057,7 @@ static ssize_t nrf24l01_read(FAR struct file *filep, FAR char *buffer,
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1089,7 +1089,7 @@ static ssize_t nrf24l01_write(FAR struct file *filep, FAR const char *buffer,
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1123,7 +1123,7 @@ static int nrf24l01_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -1368,7 +1368,7 @@ static int nrf24l01_poll(FAR struct file *filep, FAR struct pollfd *fds,
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
@@ -2041,7 +2041,7 @@ ssize_t nrf24l01_recv(struct nrf24l01_dev_s *dev, uint8_t *buffer,
     {
       /* This should only happen if the wait was canceled by an signal */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
       return ret;
     }
 
diff --git a/fs/unionfs/fs_unionfs.c b/fs/unionfs/fs_unionfs.c
index 27bd733e6e..4f11a59646 100644
--- a/fs/unionfs/fs_unionfs.c
+++ b/fs/unionfs/fs_unionfs.c
@@ -254,7 +254,7 @@ static int unionfs_semtake(FAR struct unionfs_inode_s *ui, bool noint)
       ret = nxsem_wait(&ui->ui_exclsem);
       if (ret < 0)
         {
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
           if (!noint)
             {
               return ret;
diff --git a/graphics/nxterm/nxterm_redraw.c b/graphics/nxterm/nxterm_redraw.c
index 5e1b2b9749..5d76d1c1d6 100644
--- a/graphics/nxterm/nxterm_redraw.c
+++ b/graphics/nxterm/nxterm_redraw.c
@@ -103,7 +103,7 @@ void nxterm_redraw(NXTERM handle, FAR const struct nxgl_rect_s *rect, bool more)
            * was interrupted by a signal.
            */
 
-          DEBUGASSERT(errno == EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
         }
     }
   while (ret < 0);
diff --git a/libc/audio/lib_buffer.c b/libc/audio/lib_buffer.c
index 8fe2fd51f3..a9de5c74bf 100644
--- a/libc/audio/lib_buffer.c
+++ b/libc/audio/lib_buffer.c
@@ -80,7 +80,7 @@ static void apb_semtake(FAR struct ap_buffer_s *apb)
        * the wait was awakened by a signal.
        */
 
-      DEBUGASSERT(_SEM_ERRNO(ret) == EINTR);
+      DEBUGASSERT(_SEM_ERRNO(ret) == EINTR || _SEM_ERRNO(ret) == ECANCELED);
       UNUSED(ret);
     }
 }
diff --git a/libc/misc/lib_filesem.c b/libc/misc/lib_filesem.c
index ff51e009f0..226a3d2573 100644
--- a/libc/misc/lib_filesem.c
+++ b/libc/misc/lib_filesem.c
@@ -99,7 +99,7 @@ void lib_take_semaphore(FAR struct file_struct *stream)
            * was awakened by a signal.
            */
 
-          DEBUGASSERT(_SEM_ERRNO(ret) == EINTR);
+          DEBUGASSERT(_SEM_ERRNO(ret) == EINTR || _SEM_ERRNO(ret) == ECANCELED);
           UNUSED(ret);
         }
 
diff --git a/libc/misc/lib_streamsem.c b/libc/misc/lib_streamsem.c
index 6bfb1d1a6a..d1b78758f6 100644
--- a/libc/misc/lib_streamsem.c
+++ b/libc/misc/lib_streamsem.c
@@ -66,7 +66,7 @@ void stream_semtake(FAR struct streamlist *list)
        * the wait was awakened by a signal.
        */
 
-      DEBUGASSERT(_SEM_ERRNO(ret) == EINTR);
+      DEBUGASSERT(_SEM_ERRNO(ret) == EINTR || _SEM_ERRNO(ret) == ECANCELED);
       UNUSED(ret);
     }
 }
diff --git a/libc/modlib/modlib_registry.c b/libc/modlib/modlib_registry.c
index 3d9fabc448..2acfed819a 100644
--- a/libc/modlib/modlib_registry.c
+++ b/libc/modlib/modlib_registry.c
@@ -122,7 +122,7 @@ void modlib_registry_lock(void)
            * the wait was awakened by a signal.
            */
 
-          DEBUGASSERT(_SEM_ERRNO(ret) == EINTR);
+          DEBUGASSERT(_SEM_ERRNO(ret) == EINTR || _SEM_ERRNO(ret) == ECANCELED);
           UNUSED(ret);
         }
 
diff --git a/libc/netdb/lib_dnsinit.c b/libc/netdb/lib_dnsinit.c
index 5d57b4694a..506294c582 100644
--- a/libc/netdb/lib_dnsinit.c
+++ b/libc/netdb/lib_dnsinit.c
@@ -169,7 +169,7 @@ void dns_semtake(void)
        if (ret < 0)
          {
            errcode = _SEM_ERRNO(ret);
-           DEBUGASSERT(errcode == EINTR);
+           DEBUGASSERT(errcode == EINTR || errcode == ECANCELED);
          }
     }
   while (ret < 0 && errcode == EINTR);
diff --git a/libc/stdlib/lib_mkstemp.c b/libc/stdlib/lib_mkstemp.c
index 41b4452675..1282a4d907 100644
--- a/libc/stdlib/lib_mkstemp.c
+++ b/libc/stdlib/lib_mkstemp.c
@@ -155,7 +155,7 @@ static void get_base62(FAR uint8_t *ptr)
 
   while ((ret = _SEM_WAIT(&g_b62sem)) < 0)
     {
-      DEBUGASSERT(_SEM_ERRNO(ret) == EINTR);
+      DEBUGASSERT(_SEM_ERRNO(ret) == EINTR || _SEM_ERRNO(ret) == ECANCELED);
     }
 
   memcpy(ptr, g_base62, MAX_XS);
@@ -294,4 +294,3 @@ int mkstemp(FAR char *path_template)
 }
 
 #endif /* CONFIG_FS_WRITABLE */
-
diff --git a/libc/wqueue/work_lock.c b/libc/wqueue/work_lock.c
index 8b8a5682c0..007ffc60af 100644
--- a/libc/wqueue/work_lock.c
+++ b/libc/wqueue/work_lock.c
@@ -77,7 +77,7 @@ int work_lock(void)
   ret = sem_wait(&g_usrsem);
   if (ret < 0)
     {
-      DEBUGASSERT(errno == EINTR);
+      DEBUGASSERT(errno == EINTR || errno == ECANCELED);
       return -EINTR;
     }
 #else
diff --git a/libnx/nxmu/nxmu_semtake.c b/libnx/nxmu/nxmu_semtake.c
index a4eaae921c..8c92a3b4c4 100644
--- a/libnx/nxmu/nxmu_semtake.c
+++ b/libnx/nxmu/nxmu_semtake.c
@@ -66,7 +66,7 @@ void nxmu_semtake(sem_t *sem)
        * awakened by a signal.
        */
 
-      DEBUGASSERT(_SEM_ERRNO(ret) == EINTR);
+      DEBUGASSERT(_SEM_ERRNO(ret) == EINTR || _SEM_ERRNO(ret) == ECANCELED);
       UNUSED(ret);
     }
 }
diff --git a/mm/mm_gran/mm_grancritical.c b/mm/mm_gran/mm_grancritical.c
index 105bb51ff0..bf35e63e58 100644
--- a/mm/mm_gran/mm_grancritical.c
+++ b/mm/mm_gran/mm_grancritical.c
@@ -83,7 +83,7 @@ void gran_enter_critical(FAR struct gran_s *priv)
       ret = nxsem_wait(&priv->exclsem);
       if (ret < 0)
         {
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
         }
     }
   while (ret == -EINTR);
@@ -101,5 +101,3 @@ void gran_leave_critical(FAR struct gran_s *priv)
 
 
 #endif /* CONFIG_GRAN */
-
-
diff --git a/mm/mm_heap/mm_sem.c b/mm/mm_heap/mm_sem.c
index 51eda272a5..55d90447c5 100644
--- a/mm/mm_heap/mm_sem.c
+++ b/mm/mm_heap/mm_sem.c
@@ -198,10 +198,10 @@ void mm_takesemaphore(FAR struct mm_heap_s *heap)
           if (ret < 0)
             {
 #if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__)
-              DEBUGASSERT(ret == -EINTR);
+              DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
 #else
               int errcode = get_errno();
-              DEBUGASSERT(errcode == EINTR);
+              DEBUGASSERT(errcode == EINTR || errcode == ECANCELED);
               ret = -errcode;
 #endif
             }
diff --git a/net/icmp/icmp_conn.c b/net/icmp/icmp_conn.c
index e360a5a5dc..a6726180b3 100644
--- a/net/icmp/icmp_conn.c
+++ b/net/icmp/icmp_conn.c
@@ -170,7 +170,7 @@ void icmp_free(FAR struct icmp_conn_s *conn)
        * the wait was awakened by a signal.
        */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
     }
 
   UNUSED(ret);
diff --git a/net/icmpv6/icmpv6_conn.c b/net/icmpv6/icmpv6_conn.c
index 614285f862..22ad2b688f 100644
--- a/net/icmpv6/icmpv6_conn.c
+++ b/net/icmpv6/icmpv6_conn.c
@@ -170,7 +170,7 @@ void icmpv6_free(FAR struct icmpv6_conn_s *conn)
        * the wait was awakened by a signal.
        */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
     }
 
   UNUSED(ret);
diff --git a/net/igmp/igmp_msg.c b/net/igmp/igmp_msg.c
index 348b0dd571..396393e376 100644
--- a/net/igmp/igmp_msg.c
+++ b/net/igmp/igmp_msg.c
@@ -113,7 +113,7 @@ void igmp_waitmsg(FAR struct igmp_group_s *group, uint8_t msgid)
            * the wait is awakened by a signal.
            */
 
-          ASSERT(ret == -EINTR);
+          ASSERT(ret == -EINTR || ret == -ECANCELED);
         }
 
       UNUSED(ret);
diff --git a/net/local/local_accept.c b/net/local/local_accept.c
index f8fb468ad5..fb0ca1b6a4 100644
--- a/net/local/local_accept.c
+++ b/net/local/local_accept.c
@@ -73,7 +73,7 @@ static int local_waitlisten(FAR struct local_conn_s *server)
       ret = nxsem_wait(&server->lc_waitsem);
       if (ret < 0)
         {
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
           return ret;
         }
     }
diff --git a/net/pkt/pkt_conn.c b/net/pkt/pkt_conn.c
index 13f5c92dfe..701b69bbc3 100644
--- a/net/pkt/pkt_conn.c
+++ b/net/pkt/pkt_conn.c
@@ -99,7 +99,7 @@ static inline void _pkt_semtake(sem_t *sem)
        * the wait was awakened by a signal.
        */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
     }
 
   UNUSED(ret);
diff --git a/net/socket/net_sockets.c b/net/socket/net_sockets.c
index a39dd98e79..4dd660ca2e 100644
--- a/net/socket/net_sockets.c
+++ b/net/socket/net_sockets.c
@@ -69,7 +69,7 @@ static void _net_semtake(FAR struct socketlist *list)
        * the wait was awakened by a signal.
        */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
     }
 
   UNUSED(ret);
diff --git a/net/udp/udp_conn.c b/net/udp/udp_conn.c
index d301b36543..00bd63b92c 100644
--- a/net/udp/udp_conn.c
+++ b/net/udp/udp_conn.c
@@ -118,7 +118,7 @@ static inline void _udp_semtake(FAR sem_t *sem)
        * the wait was awakened by a signal.
        */
 
-      ASSERT(ret == -EINTR);
+      ASSERT(ret == -EINTR || ret == -ECANCELED);
     }
 
   UNUSED(ret);
diff --git a/net/usrsock/usrsock_bind.c b/net/usrsock/usrsock_bind.c
index 39c17fb033..f7a09e8d11 100644
--- a/net/usrsock/usrsock_bind.c
+++ b/net/usrsock/usrsock_bind.c
@@ -204,7 +204,7 @@ int usrsock_bind(FAR struct socket *psock,
 
       while ((ret = net_lockedwait(&state.recvsem)) < 0)
         {
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
         }
 
       ret = state.result;
diff --git a/net/usrsock/usrsock_close.c b/net/usrsock/usrsock_close.c
index 96cbc73bd1..78368f9da8 100644
--- a/net/usrsock/usrsock_close.c
+++ b/net/usrsock/usrsock_close.c
@@ -175,7 +175,7 @@ int usrsock_close(FAR struct usrsock_conn_s *conn)
 
       while ((ret = net_lockedwait(&state.recvsem)) < OK)
         {
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
         }
 
       ret = state.result;
diff --git a/net/usrsock/usrsock_conn.c b/net/usrsock/usrsock_conn.c
index 0e038bf9fb..665733d36b 100644
--- a/net/usrsock/usrsock_conn.c
+++ b/net/usrsock/usrsock_conn.c
@@ -95,7 +95,7 @@ static void _usrsock_semtake(FAR sem_t *sem)
        * the wait was awakened by a signal.
        */
 
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
     }
 }
 
diff --git a/net/usrsock/usrsock_connect.c b/net/usrsock/usrsock_connect.c
index 76906ec5e9..3c73ce3e55 100644
--- a/net/usrsock/usrsock_connect.c
+++ b/net/usrsock/usrsock_connect.c
@@ -229,7 +229,7 @@ int usrsock_connect(FAR struct socket *psock,
       ret = net_lockedwait(&state.recvsem);
       if (ret < 0)
         {
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
 
           /* Wait interrupted, exit early. */
 
diff --git a/net/usrsock/usrsock_dev.c b/net/usrsock/usrsock_dev.c
index 171434ca8f..139a907b26 100644
--- a/net/usrsock/usrsock_dev.c
+++ b/net/usrsock/usrsock_dev.c
@@ -1215,7 +1215,7 @@ int usrsockdev_do_request(FAR struct usrsock_conn_s *conn,
 
   while ((ret = net_lockedwait(&dev->req.sem)) < 0)
     {
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
     }
 
   if (usrsockdev_is_opened(dev))
@@ -1234,7 +1234,7 @@ int usrsockdev_do_request(FAR struct usrsock_conn_s *conn,
 
       while ((ret = net_lockedwait(&dev->req.acksem)) < 0)
         {
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
         }
     }
   else
diff --git a/net/usrsock/usrsock_getsockname.c b/net/usrsock/usrsock_getsockname.c
index d3bb4940a8..f60304fb59 100644
--- a/net/usrsock/usrsock_getsockname.c
+++ b/net/usrsock/usrsock_getsockname.c
@@ -235,7 +235,7 @@ int usrsock_getsockname(FAR struct socket *psock,
 
       while ((ret = net_lockedwait(&state.reqstate.recvsem)) < 0)
         {
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
         }
 
       ret = state.reqstate.result;
diff --git a/net/usrsock/usrsock_getsockopt.c b/net/usrsock/usrsock_getsockopt.c
index 4b56713c38..ddfd2f76b6 100644
--- a/net/usrsock/usrsock_getsockopt.c
+++ b/net/usrsock/usrsock_getsockopt.c
@@ -246,7 +246,7 @@ int usrsock_getsockopt(FAR struct usrsock_conn_s *conn, int level, int option,
 
       while ((ret = net_lockedwait(&state.reqstate.recvsem)) < 0)
         {
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
         }
 
       ret = state.reqstate.result;
diff --git a/net/usrsock/usrsock_recvfrom.c b/net/usrsock/usrsock_recvfrom.c
index d30b2a0379..f1f2dee144 100644
--- a/net/usrsock/usrsock_recvfrom.c
+++ b/net/usrsock/usrsock_recvfrom.c
@@ -444,7 +444,7 @@ ssize_t usrsock_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
 
           while ((ret = net_lockedwait(&state.reqstate.recvsem)) < 0)
             {
-              DEBUGASSERT(ret == -EINTR);
+              DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
             }
 
           ret = state.reqstate.result;
diff --git a/net/usrsock/usrsock_sendto.c b/net/usrsock/usrsock_sendto.c
index 5926c60c74..f248dbe20b 100644
--- a/net/usrsock/usrsock_sendto.c
+++ b/net/usrsock/usrsock_sendto.c
@@ -400,7 +400,7 @@ ssize_t usrsock_sendto(FAR struct socket *psock, FAR const void *buf,
 
           while ((ret = net_lockedwait(&state.recvsem)) < 0)
             {
-              DEBUGASSERT(ret == -EINTR);
+              DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
             }
 
           ret = state.result;
diff --git a/net/usrsock/usrsock_setsockopt.c b/net/usrsock/usrsock_setsockopt.c
index a84b13f403..98c55b415d 100644
--- a/net/usrsock/usrsock_setsockopt.c
+++ b/net/usrsock/usrsock_setsockopt.c
@@ -212,7 +212,7 @@ int usrsock_setsockopt(FAR struct usrsock_conn_s *conn, int level, int option,
 
       while ((ret = net_lockedwait(&state.recvsem)) < 0)
         {
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
         }
 
       ret = state.result;
diff --git a/net/usrsock/usrsock_socket.c b/net/usrsock/usrsock_socket.c
index 18287d451e..687b0ad247 100644
--- a/net/usrsock/usrsock_socket.c
+++ b/net/usrsock/usrsock_socket.c
@@ -233,7 +233,7 @@ int usrsock_socket(int domain, int type, int protocol, FAR struct socket *psock)
 
   while ((ret = net_lockedwait(&state.recvsem)) < 0)
     {
-      DEBUGASSERT(ret == -EINTR);
+      DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
     }
 
   if (state.result < 0)
diff --git a/wireless/ieee802154/mac802154_device.c b/wireless/ieee802154/mac802154_device.c
index 13dcc31a0f..fa92d8f6c3 100644
--- a/wireless/ieee802154/mac802154_device.c
+++ b/wireless/ieee802154/mac802154_device.c
@@ -444,7 +444,7 @@ static ssize_t mac802154dev_read(FAR struct file *filep, FAR char *buffer,
       ret = nxsem_wait(&dev->readsem);
       if (ret < 0)
         {
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
           dev->readpending = false;
           return ret;
         }
@@ -681,7 +681,7 @@ static int mac802154dev_ioctl(FAR struct file *filep, int cmd,
               ret = nxsem_wait(&dev->geteventsem);
               if (ret < 0)
                 {
-                  DEBUGASSERT(ret == -EINTR);
+                  DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
                   dev->geteventpending = false;
                   return ret;
                 }
diff --git a/wireless/ieee802154/mac802154_internal.h b/wireless/ieee802154/mac802154_internal.h
index dbe22c0b6f..118d8c3cd8 100644
--- a/wireless/ieee802154/mac802154_internal.h
+++ b/wireless/ieee802154/mac802154_internal.h
@@ -533,9 +533,9 @@ static inline int mac802154_takesem(sem_t *sem, bool allowinterrupt)
       ret = nxsem_wait(sem);
       if (ret < 0)
         {
-          /* EINTR is the only error that we expect */
+          /* EINTR and ECANCELED are the only errors that we expect */
 
-          DEBUGASSERT(ret == -EINTR);
+          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
 
           if (allowinterrupt)
             {
diff --git a/wireless/ieee802154/mac802154_netdev.c b/wireless/ieee802154/mac802154_netdev.c
index 0a11caf017..0c8e5ed313 100644
--- a/wireless/ieee802154/mac802154_netdev.c
+++ b/wireless/ieee802154/mac802154_netdev.c
@@ -1114,7 +1114,7 @@ static int macnet_ioctl(FAR struct net_driver_s *dev, int cmd,
                       ret = nxsem_wait(&priv->md_eventsem);
                       if (ret < 0)
                         {
-                          DEBUGASSERT(ret == -EINTR);
+                          DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
                           priv->md_eventpending = false;
                           return ret;
                         }