xserver: Branch 'master'

[Peter Hutterer]

 hw/kdrive/src/kinput.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit fa7b70a9b895789ec57562bbba0bc052fc91d134
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Jun 14 17:36:16 2016 -0700

    kdrive: Only enable threaded input if we have input devices
    
    When there aren't any devices, the input thread is going to be pretty
    lonely, so don't bother to even start it.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index c2fc7bb..6ee575c 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -1305,7 +1305,8 @@ KdInitInput(void)
     KdKeyboardInfo *ki;
     struct KdConfigDevice *dev;
 
-    InputThreadPreInit();
+    if (kdConfigPointers || kdConfigKeyboards)
+        InputThreadPreInit();
 
     kdInputEnabled = TRUE;