From 4a59ff34e95f736566119475d884e3f9022341be Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 28 Jan 2016 09:53:47 -0600 Subject: [PATCH] Update submodules --- arch | 2 +- configs | 2 +- fs/vfs/fs_poll.c | 2 +- tools/testbuild.sh | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch b/arch index 505399a54c..39dca5d1dc 160000 --- a/arch +++ b/arch @@ -1 +1 @@ -Subproject commit 505399a54c301298ec308cefcc07dd7668b6df92 +Subproject commit 39dca5d1dc63ca02a7f897ff7de0bb03fee86a60 diff --git a/configs b/configs index e643990c17..2d69d8ab99 160000 --- a/configs +++ b/configs @@ -1 +1 @@ -Subproject commit e643990c17347abf015d66bd3d832acb9d5e260b +Subproject commit 2d69d8ab99187e4270bb4b4bd1d61d5324b81916 diff --git a/fs/vfs/fs_poll.c b/fs/vfs/fs_poll.c index 668765420d..2910b30551 100644 --- a/fs/vfs/fs_poll.c +++ b/fs/vfs/fs_poll.c @@ -379,7 +379,7 @@ int poll(FAR struct pollfd *fds, nfds_t nfds, int timeout) */ err = poll_teardown(fds, nfds, &count, ret); - if (err < 0 && ret == OK) + if (err < 0 && ret >= 0) { ret = err; } diff --git a/tools/testbuild.sh b/tools/testbuild.sh index 594c58db2f..0490b5d781 100755 --- a/tools/testbuild.sh +++ b/tools/testbuild.sh @@ -44,9 +44,9 @@ unset testfile function showusage { echo "" echo "USAGE: $progname [-w|l] [-c|n] [-s] " - echo "USAGE: $progname -h" + echo " $progname -h" echo "" - echo "where" + echo "Where:" echo " -w|l selects Windows (w) or Linux (l). Default: Linux" echo " -c|n selects Windows native (n) or Cygwin (c). Default Cygwin" echo " -s Use C++ unsigned long size_t in new operator. Default unsigned int"