diff --git a/fs/vfs/fs_poll.c b/fs/vfs/fs_poll.c
index 26f1ebd215b..a7fd5ed62eb 100644
--- a/fs/vfs/fs_poll.c
+++ b/fs/vfs/fs_poll.c
@@ -334,6 +334,22 @@ int poll(FAR struct pollfd *fds, nfds_t nfds, int timeout)
              }
 
            ret = sem_timedwait(&sem, &abstime);
+           if (ret < 0)
+             {
+               int err = get_errno();
+
+               if (err == ETIMEDOUT)
+                 {
+                   /* Return zero (OK) in the event of a timeout */
+
+                   ret = OK;
+                 }
+               else
+                 {
+                   ret = -err;
+                 }
+             }
+
            irqrestore(flags);
         }
       else