summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2013-05-14 08:31:19 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2013-05-23 15:35:11 +1000
commit6589f3b55e335eef6c658c8ba1fe15a062f7e31c (patch)
treef4b00a46e6a95264115448fb3a530441c11f2b7f /dix
parent756ab88d93542f0589c9bf46f40ccc57df64f0fd (diff)
dix: devices must have valuators before touch is initialized
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'dix')
-rw-r--r--dix/devices.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/dix/devices.c b/dix/devices.c
index 291b76773..527eea028 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -1647,6 +1647,7 @@ InitTouchClassDeviceStruct(DeviceIntPtr device, unsigned int max_touches,
BUG_RETURN_VAL(device == NULL, FALSE);
BUG_RETURN_VAL(device->touch != NULL, FALSE);
+ BUG_RETURN_VAL(device->valuator == NULL, FALSE);
/* Check the mode is valid, and at least X and Y axes. */
BUG_RETURN_VAL(mode != XIDirectTouch && mode != XIDependentTouch, FALSE);