diff options
| author | Nicolas Pitre <nicolas.pitre@canonical.com> | 2010-11-10 01:33:12 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-11 10:51:35 -0800 |
| commit | 47c344d0bd290e04c57eefdb0a721726e53bb57e (patch) | |
| tree | 1eb43fe592f19b9269ae3cacbe28380b31b6d5da /drivers/tty/vt | |
| parent | 37db8f91b7d9b064bc78acd1c615a410322e275d (diff) | |
| download | linux-3.10-47c344d0bd290e04c57eefdb0a721726e53bb57e.tar.gz linux-3.10-47c344d0bd290e04c57eefdb0a721726e53bb57e.tar.bz2 linux-3.10-47c344d0bd290e04c57eefdb0a721726e53bb57e.zip | |
vcs: make proper usage of the poll flags
Kay Sievers pointed out that usage of POLLIN is well defined by POSIX,
and the current usage here doesn't follow that definition. So let's
duplicate the same semantics as implemented by sysfs_poll() instead.
Signed-off-by: Nicolas Pitre <nicolas.pitre@canonical.com>
Acked-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty/vt')
| -rw-r--r-- | drivers/tty/vt/vc_screen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c index 273ab44cc91..eab3a1ff99e 100644 --- a/drivers/tty/vt/vc_screen.c +++ b/drivers/tty/vt/vc_screen.c @@ -553,12 +553,12 @@ static unsigned int vcs_poll(struct file *file, poll_table *wait) { struct vcs_poll_data *poll = vcs_poll_data_get(file); - int ret = 0; + int ret = DEFAULT_POLLMASK|POLLERR|POLLPRI; if (poll) { poll_wait(file, &poll->waitq, wait); - if (!poll->seen_last_update) - ret = POLLIN | POLLRDNORM; + if (poll->seen_last_update) + ret = DEFAULT_POLLMASK; } return ret; } |