---

yaml --- r: 221907 b: refs/heads/master c: 47c344d h: refs/heads/master i: 221905: 3a7925b 221903: df528ea v: v3
git-mirror · Nov 11, 2010 · 58e3754 · 58e3754
1 parent a54413e
commit 58e3754
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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;
 }