diff options
| author | Vojtech Pavlik <vojtech@silver.ucw.cz> | 2005-02-06 15:58:37 +0100 |
|---|---|---|
| committer | Vojtech Pavlik <vojtech@silver.ucw.cz> | 2005-02-06 15:58:37 +0100 |
| commit | 388e6f0d368126b2bb746d6040891c6112968675 (patch) | |
| tree | 2f37cd27902821522e0a3325537ca9385bf3d669 /drivers | |
| parent | 113fc8b33463b62ff338beb3c79b2d37547c006c (diff) | |
input: Fix poll() behavior of input handlers on disconnect.
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/evdev.c | 5 | ||||
| -rw-r--r-- | drivers/input/joydev.c | 10 | ||||
| -rw-r--r-- | drivers/input/mousedev.c | 6 | ||||
| -rw-r--r-- | drivers/input/tsdev.c | 6 |
4 files changed, 12 insertions, 15 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 776e68fcbd82..a295def203f1 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -199,9 +199,8 @@ static unsigned int evdev_poll(struct file *file, poll_table *wait) { struct evdev_list *list = file->private_data; poll_wait(file, &list->evdev->wait, wait); - if (list->head != list->tail) - return POLLIN | POLLRDNORM; - return 0; + return ((list->head == list->tail) ? 0 : (POLLIN | POLLRDNORM)) | + (list->evdev->exist ? 0 : (POLLHUP | POLLERR)); } static int evdev_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 4fe982d63bed..7fe82d6111ac 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c @@ -281,9 +281,8 @@ static unsigned int joydev_poll(struct file *file, poll_table *wait) { struct joydev_list *list = file->private_data; poll_wait(file, &list->joydev->wait, wait); - if (list->head != list->tail || list->startup < list->joydev->nabs + list->joydev->nkey) - return POLLIN | POLLRDNORM; - return 0; + return ((list->head != list->tail || list->startup < list->joydev->nabs + list->joydev->nkey) ? + (POLLIN | POLLRDNORM) : 0) | (list->joydev->exist ? 0 : (POLLHUP | POLLERR)); } static int joydev_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) @@ -468,9 +467,10 @@ static void joydev_disconnect(struct input_handle *handle) devfs_remove("input/js%d", joydev->minor); joydev->exist = 0; - if (joydev->open) + if (joydev->open) { input_close_device(handle); - else + wake_up_interruptible(&joydev->wait); + } else joydev_free(joydev); } diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index fa2d3bb3cfb1..0af7c8befcfe 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c @@ -595,9 +595,8 @@ static unsigned int mousedev_poll(struct file *file, poll_table *wait) { struct mousedev_list *list = file->private_data; poll_wait(file, &list->mousedev->wait, wait); - if (list->ready || list->buffer) - return POLLIN | POLLRDNORM; - return 0; + return ((list->ready || list->buffer) ? (POLLIN | POLLRDNORM) : 0) | + (list->mousedev->exist ? 0 : (POLLHUP | POLLERR)); } static struct file_operations mousedev_fops = { @@ -660,6 +659,7 @@ static void mousedev_disconnect(struct input_handle *handle) if (mousedev->open) { input_close_device(handle); + wake_up_interruptible(&mousedev->wait); } else { if (mousedev_mix.open) input_close_device(handle); diff --git a/drivers/input/tsdev.c b/drivers/input/tsdev.c index 52eab82f04bf..32ef023fe0df 100644 --- a/drivers/input/tsdev.c +++ b/drivers/input/tsdev.c @@ -232,11 +232,9 @@ static ssize_t tsdev_read(struct file *file, char __user *buffer, size_t count, static unsigned int tsdev_poll(struct file *file, poll_table * wait) { struct tsdev_list *list = file->private_data; - poll_wait(file, &list->tsdev->wait, wait); - if (list->head != list->tail) - return POLLIN | POLLRDNORM; - return 0; + return ((list->head == list->tail) ? 0 : (POLLIN | POLLRDNORM)) | + (list->tsdev->exist ? 0 : (POLLHUP | POLLERR)); } static int tsdev_ioctl(struct inode *inode, struct file *file, |