---

yaml --- r: 202218 b: refs/heads/master c: c18fb13 h: refs/heads/master v: v3
git-mirror · Jul 16, 2010 · d135987 · d135987
1 parent ac49328
commit d135987
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d4bf995ea873cc213c5abc5402af46ef490b8fd
+refs/heads/master: c18fb1396eb809dbc16e51da273a1789f9d799bf
diff --git a/trunk/drivers/input/evdev.c b/trunk/drivers/input/evdev.c
@@ -403,10 +403,15 @@ static unsigned int evdev_poll(struct file *file, poll_table *wait)
 {
 	struct evdev_client *client = file->private_data;
 	struct evdev *evdev = client->evdev;
+	unsigned int mask;
 
 	poll_wait(file, &evdev->wait, wait);
-	return ((client->head == client->tail) ? 0 : (POLLIN | POLLRDNORM)) |
-		(evdev->exist ? 0 : (POLLHUP | POLLERR));
+
+	mask = evdev->exist ? POLLOUT | POLLWRNORM : POLLHUP | POLLERR;
+	if (client->head != client->tail)
+		mask |= POLLIN | POLLRDNORM;
+
+	return mask;
 }
 
 #ifdef CONFIG_COMPAT