Input: mousedev - signal that device is writable in mousedev_poll()
authorJulien Moutinho <julm+linux@savines.alpes.fr.eu.org>
Fri, 16 Jul 2010 06:27:56 +0000 (23:27 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 16 Jul 2010 06:52:52 +0000 (23:52 -0700)
The Microsoft ImPS/2 mouse protocol being bidirectionnal (sic)
one may have to write in /dev/input/mice; and that works better
if select() does not hang.

Signed-off-by: Julien Moutinho <julm+linux@savines.alpes.fr.eu.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
drivers/input/mousedev.c

index d7a7a2fce745e5f448f67b4887b3abb1a3f03b27..d8f68f77007b6c1429b1c821509914bd10ee55a9 100644 (file)
@@ -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 = {