xserver: Branch 'master'

[Keith Packard]

 dix/devices.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 9ff89a2e469ab0ac5af57d0fc115127feb1c0d99
Author: Jason Gerecke <killertofu at gmail.com>
Date:   Wed Apr 29 15:08:58 2015 +1000

    dix: Do not allow device transform to be set on valuatorless devices
    
    If a device does not have any valuators, it makes no sense to set the
    device transformation. Return a BadMatch error to let the caller know
    that they're trying something stupid.
    
    Signed-off-by: Jason Gerecke <jason.gerecke at wacom.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/dix/devices.c b/dix/devices.c
index b2de6f1..1f8dabd 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -177,6 +177,9 @@ DeviceSetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
             if (!isfinite(f[i]))
                 return BadValue;
 
+	if (!dev->valuator)
+		return BadMatch;
+
         if (!checkonly)
             DeviceSetTransform(dev, f);
     }