summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-11-03 08:58:58 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-11-09 13:26:47 +1000
commit11840595a1be9f2df7390bcc708cc176e60d3ef2 (patch)
treeed4f51002559ff88a4d3628d326003915fa9723c
parent22715e465b415b3351b83b8279a4f44157f63199 (diff)
dix: Don't let a driver without a ProximityClassRec post events
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--dix/getevents.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/getevents.c b/dix/getevents.c
index df47b2b95..8798f6418 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -1546,7 +1546,7 @@ GetProximityEvents(InternalEvent *events, DeviceIntPtr pDev, int type, const Val
/* Sanity checks. */
if ((type != ProximityIn && type != ProximityOut) || !mask_in)
return 0;
- if (!pDev->valuator)
+ if (!pDev->valuator || !pDev->proximity)
return 0;
valuator_mask_copy(&mask, mask_in);