diff options
| author | Julien Moutinho | 2010-07-16 08:27:56 +0200 |
|---|---|---|
| committer | Dmitry Torokhov | 2010-07-16 08:52:52 +0200 |
| commit | 4d4bf995ea873cc213c5abc5402af46ef490b8fd (patch) | |
| tree | ae150da8d3053ce30f49509c8c030c6a9c53ccef /drivers/input/mousedev.c | |
| parent | Input: change input handlers to use bool when possible (diff) | |
| download | kernel-qcow2-linux-4d4bf995ea873cc213c5abc5402af46ef490b8fd.tar.gz kernel-qcow2-linux-4d4bf995ea873cc213c5abc5402af46ef490b8fd.tar.xz kernel-qcow2-linux-4d4bf995ea873cc213c5abc5402af46ef490b8fd.zip | |
Input: mousedev - signal that device is writable in mousedev_poll()
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>
Diffstat (limited to 'drivers/input/mousedev.c')
| -rw-r--r-- | drivers/input/mousedev.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index d7a7a2fce745..d8f68f77007b 100644 --- a/drivers/input/mousedev.c +++ b/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 = { |