summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Hlusiak <saschahlusiak@arcor.de>2008-03-25 17:50:50 +0100
committerSascha Hlusiak <saschahlusiak@arcor.de>2008-03-25 17:50:50 +0100
commit9df915b84d45d39aed7557c98883b20a66da2e96 (patch)
tree4fdd08d600de7cb24b3e9da50c9d7dbfb29b080c
parent47eb658e802775021e3efec109f95431cca188ca (diff)
parent333e7123dc484888d79c0f5aa3977bd72f1eb341 (diff)
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
-rw-r--r--dix/getevents.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/getevents.c b/dix/getevents.c
index 3e6fe5ae0..bf9331eae 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -349,7 +349,7 @@ getValuatorEvents(xEvent *events, DeviceIntPtr pDev, int first_valuator,
for (i = first_valuator; i < final_valuator; i += 6, xv++, events++) {
xv->type = DeviceValuator;
xv->first_valuator = i;
- xv->num_valuators = ((num_valuators - i) > 6) ? 6 : (num_valuators - i);
+ xv->num_valuators = ((final_valuator - i) > 6) ? 6 : (final_valuator - i);
xv->deviceid = pDev->id;
switch (final_valuator - i) {
case 6: