dix: fix calculation of valuator events.
Follow-up to 4971315296
. countValuatorEvents was copied from GKVE where it
was obviously broken but nobody noticed. GPE had the correct version, but that
one got lost during de-duplication. Restoring the correct calculation - if we
have 6 valuators, we want 1 valuator event, not 2.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
This commit is contained in:
parent
13de7511b1
commit
ee1a6c2841
|
@ -772,9 +772,9 @@ static int
|
||||||
countValuatorEvents(int num_valuators)
|
countValuatorEvents(int num_valuators)
|
||||||
{
|
{
|
||||||
if (num_valuators) {
|
if (num_valuators) {
|
||||||
if ((num_valuators / 6) + 1 > MAX_VALUATOR_EVENTS)
|
if (((num_valuators - 1) / 6) + 1 > MAX_VALUATOR_EVENTS)
|
||||||
num_valuators = MAX_VALUATOR_EVENTS;
|
num_valuators = MAX_VALUATOR_EVENTS * 6;
|
||||||
return (num_valuators / 6) + 1;
|
return ((num_valuators - 1)/ 6) + 1;
|
||||||
} else
|
} else
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue