diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-11-19 02:39:21 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-11-19 02:39:21 +0000 |
commit | 9cf192e2eca3b7d266e25a49a02008fe015ff389 (patch) | |
tree | b72c2245db1837de8cf286ac919242c220307b36 /nuttx/fs | |
parent | c0b98435519199874716495c3654fffff8f6fab9 (diff) | |
download | px4-nuttx-9cf192e2eca3b7d266e25a49a02008fe015ff389.tar.gz px4-nuttx-9cf192e2eca3b7d266e25a49a02008fe015ff389.tar.bz2 px4-nuttx-9cf192e2eca3b7d266e25a49a02008fe015ff389.zip |
Revert part of last change
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1285 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/fs')
-rw-r--r-- | nuttx/fs/fs_poll.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/fs/fs_poll.c b/nuttx/fs/fs_poll.c index 9eed46c05..133f16f49 100644 --- a/nuttx/fs/fs_poll.c +++ b/nuttx/fs/fs_poll.c @@ -93,7 +93,7 @@ static void poll_semtake(FAR sem_t *sem) ****************************************************************************/ #if CONFIG_NFILE_DESCRIPTORS > 0 -static int poll_fdsetup(int fd, FAR struct pollfd *fds, boolean setup) +static int poll_fdsetup(int fd, FAR struct pollfd *fds) { FAR struct filelist *list; FAR struct file *this_file; @@ -109,7 +109,7 @@ static int poll_fdsetup(int fd, FAR struct pollfd *fds, boolean setup) #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 if ((unsigned int)fd < (CONFIG_NFILE_DESCRIPTORS+CONFIG_NSOCKET_DESCRIPTORS)) { - return net_poll(fds->fd, fds, setup); + return net_poll(fd, fds); } else #endif @@ -137,7 +137,7 @@ static int poll_fdsetup(int fd, FAR struct pollfd *fds, boolean setup) { /* Yes, then setup the poll */ - ret = (int)inode->u.i_ops->poll(this_file, fds, setup); + ret = (int)inode->u.i_ops->poll(this_file, fds); } return ret; } @@ -168,7 +168,7 @@ static inline int poll_setup(FAR struct pollfd *fds, nfds_t nfds, sem_t *sem) /* Set up the poll */ - ret = poll_fdsetup(fds[i].fd, &fds[i], TRUE); + ret = poll_fdsetup(fds[i].fd, &fds[i]); if (ret < 0) { return ret; @@ -201,7 +201,7 @@ static inline int poll_teardown(FAR struct pollfd *fds, nfds_t nfds, int *count) { /* Teardown the poll */ - status = poll_fdsetup(fds[i].fd, &fds[i], FALSE); + status = poll_fdsetup(fds[i].fd, NULL); if (status < 0) { ret = status; |