diff --git a/arch b/arch
index d99e8ced384..098a35f7dd3 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit d99e8ced38440ef61bebfd1507269b9072aba355
+Subproject commit 098a35f7dd39b6e4546e2b490f18f7d71a338e23
diff --git a/sched/semaphore/sem_tickwait.c b/sched/semaphore/sem_tickwait.c
index 8d742a17300..cfc768065b0 100644
--- a/sched/semaphore/sem_tickwait.c
+++ b/sched/semaphore/sem_tickwait.c
@@ -138,7 +138,8 @@ int sem_tickwait(FAR sem_t *sem, uint32_t start, uint32_t delay)
   elapsed = clock_systimer() - start;
   if (elapsed >= (UINT32_MAX / 2) || elapsed >= delay)
     {
-      return -ETIMEDOUT;
+      ret = -ETIMEDOUT;
+      goto errout_with_irqdisabled;
     }
 
   delay -= elapsed;