From a60c245e0abfe0762f64aaff4e800a750c3f6759 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 21 Nov 2014 06:38:26 -0600 Subject: vfs/poll: add proper handling for sem_timedwait errnos. From Jussi Kivilinna --- nuttx/fs/vfs/fs_poll.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nuttx/fs/vfs/fs_poll.c b/nuttx/fs/vfs/fs_poll.c index 26f1ebd21..a7fd5ed62 100644 --- a/nuttx/fs/vfs/fs_poll.c +++ b/nuttx/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 -- cgit v1.2.3