aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-05-13 12:51:52 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-05-16 14:27:08 +1000
commit54628989356793828fcbb5f62a091b962c7da4f9 (patch)
tree4215b8b939ede6b9e9053c167b0bfce982144b0d
parentFix copy-paste error when probing type name (diff)
downloadxf86-input-evdev-54628989356793828fcbb5f62a091b962c7da4f9.tar.gz
xf86-input-evdev-54628989356793828fcbb5f62a091b962c7da4f9.tar.bz2
xf86-input-evdev-54628989356793828fcbb5f62a091b962c7da4f9.zip
Use xf86DisableDevice instead of the DIX' DisableDevice.
DisableDevice has changed API in xi2, xf86DisableDevice hasn't. So let's use this one so we can have one version for master and xi2. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/evdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/evdev.c b/src/evdev.c
index 922d37f..647278f 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -320,7 +320,7 @@ EvdevReopenTimer(OsTimerPtr timer, CARD32 time, pointer arg)
{
xf86Msg(X_ERROR, "%s: Device has changed - disabling.\n",
pInfo->name);
- DisableDevice(pInfo->dev);
+ xf86DisableDevice(pInfo->dev, FALSE);
close(pInfo->fd);
pInfo->fd = -1;
pEvdev->min_maj = 0; /* don't hog the device */
@@ -335,7 +335,7 @@ EvdevReopenTimer(OsTimerPtr timer, CARD32 time, pointer arg)
{
xf86Msg(X_ERROR, "%s: Failed to reopen device after %d attempts.\n",
pInfo->name, pEvdev->reopen_attempts);
- DisableDevice(pInfo->dev);
+ xf86DisableDevice(pInfo->dev, FALSE);
pEvdev->min_maj = 0; /* don't hog the device */
return 0;
}