From 8fa14b8fedd14702adac2d9ab436c0f9924b0bcf Mon Sep 17 00:00:00 2001 From: Alan Carvalho de Assis Date: Sat, 16 Jul 2016 07:03:38 -0600 Subject: [PATCH] Fix poll-related compile issues introduced with recent PTY changes --- drivers/serial/pty.c | 4 ++-- fs/vfs/fs_poll.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/serial/pty.c b/drivers/serial/pty.c index ec2db0002e..69fc6de8b4 100644 --- a/drivers/serial/pty.c +++ b/drivers/serial/pty.c @@ -529,7 +529,7 @@ static int pty_poll(FAR struct file *filep, FAR struct pollfd *fds, if ((fds->events & POLLIN) != 0) { - ret = file_poll(dev->pd_src, fds, setup); + ret = file_poll(&dev->pd_src, fds, setup); } if (ret >= OK || ret == -ENOTTY) @@ -538,7 +538,7 @@ static int pty_poll(FAR struct file *filep, FAR struct pollfd *fds, if ((fds->events & POLLOUT) != 0) { - ret = file_poll(dev->pd_sink, fds, setup); + ret = file_poll(&dev->pd_sink, fds, setup); } } diff --git a/fs/vfs/fs_poll.c b/fs/vfs/fs_poll.c index 375267e11a..605147ec7f 100644 --- a/fs/vfs/fs_poll.c +++ b/fs/vfs/fs_poll.c @@ -317,8 +317,8 @@ int fdesc_poll(int fd, FAR struct pollfd *fds, bool setup) /* The errno value has already been set */ int errorcode = get_errno(); - DEBUGASSERT(errcode > 0); - return -errcode; + DEBUGASSERT(errorcode > 0); + return -errorcode; } /* Let file_poll() do the rest */