summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@redhat.com>2008-10-14 17:02:43 +1030
committerPeter Hutterer <peter.hutterer@redhat.com>2008-10-14 17:18:08 +1030
commit36a687796f3a810812bc7e22791fe21f2be618d6 (patch)
tree54ea7e8b27b5b4d841b6bf6d99d05f04cbaebc41
parent26229df106f604ffad9a602e128108e93678c403 (diff)
Fix "Device reopened after N attempts" message.
(cherry picked from commit 0089d931ac5fb290c82908da652b28c8b515d449)
-rw-r--r--src/evdev.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/evdev.c b/src/evdev.c
index 558b996..aafbbe5 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -185,12 +185,10 @@ EvdevReopenTimer(OsTimerPtr timer, CARD32 time, pointer arg)
if (pInfo->fd != -1)
{
- pEvdev->reopen_left = 0;
-
if (EvdevCacheCompare(pInfo, TRUE) == Success)
{
xf86Msg(X_INFO, "%s: Device reopened after %d attempts.\n", pInfo->name,
- pEvdev->reopen_attempts - pEvdev->reopen_left);
+ pEvdev->reopen_attempts - pEvdev->reopen_left + 1);
EvdevOn(pInfo->dev);
} else
{
@@ -200,6 +198,7 @@ EvdevReopenTimer(OsTimerPtr timer, CARD32 time, pointer arg)
close(pInfo->fd);
pInfo->fd = -1;
}
+ pEvdev->reopen_left = 0;
return 0;
}