---

yaml --- r: 202217 b: refs/heads/master c: 4d4bf99 h: refs/heads/master i: 202215: b128683 v: v3
git-mirror · Jul 16, 2010 · ac49328 · ac49328
1 parent cae6c3f
commit ac49328
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: 20da92de8ec3c1d4ba7e5aca322d38b6ce634932
+refs/heads/master: 4d4bf995ea873cc213c5abc5402af46ef490b8fd
diff --git a/trunk/drivers/input/mousedev.c b/trunk/drivers/input/mousedev.c
@@ -765,10 +765,15 @@ static unsigned int mousedev_poll(struct file *file, poll_table *wait)
 {
 	struct mousedev_client *client = file->private_data;
 	struct mousedev *mousedev = client->mousedev;
+	unsigned int mask;
 
 	poll_wait(file, &mousedev->wait, wait);
-	return ((client->ready || client->buffer) ? (POLLIN | POLLRDNORM) : 0) |
-		(mousedev->exist ? 0 : (POLLHUP | POLLERR));
+
+	mask = mousedev->exist ? POLLOUT | POLLWRNORM : POLLHUP | POLLERR;
+	if (client->ready || client->buffer)
+		mask |= POLLIN | POLLRDNORM;
+
+	return mask;
 }
 
 static const struct file_operations mousedev_fops = {