xserver: Branch 'master'

[Peter Hutterer]

 hw/xfree86/common/xf86Xinput.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit da9fec4eddd554b4b709ba58b4436aef5a76cd51
Author: Eric Biggers <ebiggers3 at gmail.com>
Date:   Thu Jun 9 19:45:15 2016 -0500

    Allow ConstantDeceleration < 1.0
    
    As documented in xorg.conf(5), a value of ConstantDeceleration between 0
    and 1 will speed up the pointer.  However, values less than 1 actually
    had no effect.  Fix this.
    
    Note that this bug only affected "ConstantDeceleration" as configured
    through xorg.conf, not "Device Accel Constant Deceleration" as configured
    through xinput.  The property handler AccelSetDecelProperty() also did
    not need to be changed, as it did not limit the values of the property.
    
    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=92766
    
    Signed-off-by: Eric Biggers <ebiggers3 at gmail.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/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index d18f53e..e15ae3d 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -130,7 +130,7 @@ ProcessVelocityConfiguration(DeviceIntPtr pDev, const char *devname, void *list,
 
     /* common settings (available via device properties) */
     tempf = xf86SetRealOption(list, "ConstantDeceleration", 1.0);
-    if (tempf > 1.0) {
+    if (tempf != 1.0) {
         xf86Msg(X_CONFIG, "%s: (accel) constant deceleration by %.1f\n",
                 devname, tempf);
         prop = XIGetKnownProperty(ACCEL_PROP_CONSTANT_DECELERATION);