From 58e3754ce9db392b2e7e783aced8f8c7033f61c9 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nicolas.pitre@canonical.com>
Date: Wed, 10 Nov 2010 01:33:12 -0500
Subject: [PATCH] --- yaml --- r: 221907 b: refs/heads/master c:
 47c344d0bd290e04c57eefdb0a721726e53bb57e h: refs/heads/master i:   221905:
 3a7925ba91f351a27846db23237d84ab0c6ee17f   221903:
 df528eacaf4f626fb9ea05ff7ed250f79e58ae57 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/tty/vt/vc_screen.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0fd3d00170ce..6b7b7f08e27c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37db8f91b7d9b064bc78acd1c615a410322e275d
+refs/heads/master: 47c344d0bd290e04c57eefdb0a721726e53bb57e
diff --git a/trunk/drivers/tty/vt/vc_screen.c b/trunk/drivers/tty/vt/vc_screen.c
index 273ab44cc91d..eab3a1ff99e4 100644
--- a/trunk/drivers/tty/vt/vc_screen.c
+++ b/trunk/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;
 }