Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: reduce raciness when input handlers disconnect
  Input: ucb1x00 - do not access input_dev->private directly
  Input: logips2pp - fix typo in Kconfig
  Input: db9 - do not ignore dev2 module parameter

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 06f0541b24d..10e3b7bc925 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -594,9 +594,9 @@ static void joydev_disconnect(struct input_handle *handle)
 
         if (joydev->open) {
                 input_close_device(handle);
-                wake_up_interruptible(&joydev->wait);
                 list_for_each_entry(client, &joydev->client_list, node)
                         kill_fasync(&client->fasync, SIGIO, POLL_HUP);
+                wake_up_interruptible(&joydev->wait);
         } else
                 joydev_free(joydev);
 }