From 54628989356793828fcbb5f62a091b962c7da4f9 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 13 May 2009 12:51:52 +1000 Subject: 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 --- src/evdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/evdev.c') 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; } -- cgit v1.2.3