sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix poll-related compile issues introduced with recent PTY changes

Browse Source
This commit is contained in:
Alan Carvalho de Assis 2016-07-16 07:03:38 -06:00 committed by Gregory Nutt
parent 11fe9378df
commit 8fa14b8fed
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/serial/pty.c
View File

@ -529,7 +529,7 @@ static int pty_poll(FAR struct file *filep, FAR struct pollfd *fds,
if ((fds->events & POLLIN) != 0) 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) 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) if ((fds->events & POLLOUT) != 0)
{ {
ret = file_poll(dev->pd_sink, fds, setup); ret = file_poll(&dev->pd_sink, fds, setup);
} }
} }

4
fs/vfs/fs_poll.c
View File

@ -317,8 +317,8 @@ int fdesc_poll(int fd, FAR struct pollfd *fds, bool setup)
/* The errno value has already been set */ /* The errno value has already been set */
int errorcode = get_errno(); int errorcode = get_errno();
DEBUGASSERT(errcode > 0); DEBUGASSERT(errorcode > 0);
return -errcode; return -errorcode;
} }
/* Let file_poll() do the rest */ /* Let file_poll() do the rest */