diff options
| author | Zephaniah E. Hull <warp@agamemnon.b5> | 2007-04-24 07:01:54 -0400 |
|---|---|---|
| committer | Zephaniah E. Hull <warp@agamemnon.b5> | 2007-04-24 07:01:54 -0400 |
| commit | 246812bfbcd856ac0dea237cdbe252706fe17688 (patch) | |
| tree | 693cf5b7786d801719f6f32b997c0d44b16f955f | |
| parent | a0ea7363f51ff6c2bb81006b7220b7daa9ee9221 (diff) | |
| download | xorg-driver-xf86-input-evdev-246812bfbcd856ac0dea237cdbe252706fe17688.tar.gz | |
Remove the evil xf86ActivateDevice declaration, don't need it anymore.
Fix the crash on device unplug.
NOTE: We still don't properly get rid of ourselves.
| -rw-r--r-- | src/evdev.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/evdev.c b/src/evdev.c index 63b8eb0..9b318d7 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -72,12 +72,7 @@ #include <xf86_OSproc.h> -/* - * FIXME: This should most definitely not be here. - * But I need it, even if it _is_ private. - */ - -void xf86ActivateDevice(InputInfoPtr pInfo); +static int EvdevProc(DeviceIntPtr device, int what); /** * Obtain various information using ioctls on the given socket. This @@ -123,7 +118,7 @@ EvdevReadInput(InputInfoPtr pInfo) strerror(errno), errno, len, sizeof (ev)); if (len < 0) { evdevDevicePtr pEvdev = pInfo->private; - pEvdev->callback(pEvdev->pInfo->dev, DEVICE_OFF); + EvdevProc(pEvdev->pInfo->dev, DEVICE_OFF); } break; } |