summaryrefslogtreecommitdiff
path: root/nuttx/drivers/dev_null.c
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2008-11-19 18:43:50 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2008-11-19 18:43:50 +0000
commitd8c1d769c45dde09573ea6ba3f968491cc5e68b2 (patch)
tree6a6105e2401ec7e9eb4e590c49c3121b2c4b82ae /nuttx/drivers/dev_null.c
parentb62fb5c894ea28ccc83c5760605f5322bf38f971 (diff)
downloadpx4-nuttx-d8c1d769c45dde09573ea6ba3f968491cc5e68b2.tar.gz
px4-nuttx-d8c1d769c45dde09573ea6ba3f968491cc5e68b2.tar.bz2
px4-nuttx-d8c1d769c45dde09573ea6ba3f968491cc5e68b2.zip
Move poll save area back into struct pollfd (as it was
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1288 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers/dev_null.c')
-rw-r--r--nuttx/drivers/dev_null.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/nuttx/drivers/dev_null.c b/nuttx/drivers/dev_null.c
index a5e7d95ce..a8a8bb01c 100644
--- a/nuttx/drivers/dev_null.c
+++ b/nuttx/drivers/dev_null.c
@@ -56,7 +56,8 @@
static ssize_t devnull_read(FAR struct file *, FAR char *, size_t);
static ssize_t devnull_write(FAR struct file *, FAR const char *, size_t);
#ifndef CONFIG_DISABLE_POLL
-static int devnull_poll(FAR struct file *filp, FAR struct pollfd *fds);
+static int devnull_poll(FAR struct file *filp, FAR struct pollfd *fds,
+ boolean setup);
#endif
/****************************************************************************
@@ -103,9 +104,10 @@ static ssize_t devnull_write(FAR struct file *filp, FAR const char *buffer, size
****************************************************************************/
#ifndef CONFIG_DISABLE_POLL
-static int devnull_poll(FAR struct file *filp, FAR struct pollfd *fds)
+static int devnull_poll(FAR struct file *filp, FAR struct pollfd *fds,
+ boolean setup)
{
- if (fds)
+ if (setup)
{
fds->revents |= (fds->events & (POLLIN|POLLOUT));
if (fds->revents != 0)