XLibre/xf86-input-evdev
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-evdev.git synced 2026-03-24 09:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use xf86DisableDevice instead of the DIX' DisableDevice.

Browse Source 
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>
This commit is contained in:
Peter Hutterer
2009-05-13 12:51:52 +10:00
parent 9243d338d1
commit 5462898935
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/evdev.c
View File

@@ -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;
}