aboutsummaryrefslogtreecommitdiff
path: root/nuttx/net
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-01-24 23:18:32 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-01-24 23:18:32 +0000
commita2ec48846f786e72a976038c9467b25a61ad5a9f (patch)
treec4f4fcda6c667b7928c3b2aaa89a81027e298b47 /nuttx/net
parent25e9b8d0846b68a18014c63146234193bfe539e8 (diff)
downloadpx4-firmware-a2ec48846f786e72a976038c9467b25a61ad5a9f.tar.gz
px4-firmware-a2ec48846f786e72a976038c9467b25a61ad5a9f.tar.bz2
px4-firmware-a2ec48846f786e72a976038c9467b25a61ad5a9f.zip
Fix some missing logic and inconsistencies in child status logic; Fix a bug introduced into sigaction()
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5560 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/net')
-rw-r--r--nuttx/net/net_poll.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/nuttx/net/net_poll.c b/nuttx/net/net_poll.c
index ea6f54a6b..3021ac35e 100644
--- a/nuttx/net/net_poll.c
+++ b/nuttx/net/net_poll.c
@@ -367,8 +367,7 @@ int psock_poll(FAR struct socket *psock, FAR struct pollfd *fds, bool setup)
if (psock->s_type != SOCK_STREAM)
{
- ret = -ENOSYS;
- goto errout;
+ return -ENOSYS;
}
#endif
@@ -387,7 +386,6 @@ int psock_poll(FAR struct socket *psock, FAR struct pollfd *fds, bool setup)
ret = net_pollteardown(psock, fds);
}
-errout:
return ret;
}
#endif