- Use xf86RemoveEnabledDevice() in the DEVICE_OFF case too. Fixes a lock-uprel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XORG-6_8-branch

    after server reset.
- Call InitPtrFeedbackClassDeviceStruct() during DEVICE_INIT phase, in
    order to avoid a segfault in the X server caused by 'xset q'.

1 files changed, 11 insertions, 4 deletions

diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 6ea52a4..09ceb40 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -1165,13 +1165,13 @@ xf86EloPrintIdent(unsigned char	*packet,
  *
  ***************************************************************************
  */
-#if 0
+
 static void
 xf86EloPtrControl(DeviceIntPtr	dev,
 		  PtrCtrl	*ctrl)
 {
 }
-#endif
+
 
 
 /*
@@ -1283,7 +1283,10 @@ xf86EloControl(DeviceIntPtr	dev,
 	ErrorF("Unable to allocate Elographics touchscreen FocusClassDeviceStruct\n");
 	return !Success;
       }
-      
+      if (InitPtrFeedbackClassDeviceStruct(dev, xf86EloPtrControl) == FALSE) {
+	  ErrorF("unable to init ptr feedback\n");
+	  return !Success;
+      }  
       /*
        * Device reports motions on 2 axes in absolute coordinates.
        * Axes min and max values are reported in raw coordinates.
@@ -1466,7 +1469,11 @@ xf86EloControl(DeviceIntPtr	dev,
     DBG(2, ErrorF("Elographics touchscreen close...\n"));
     dev->public.on = FALSE;
     if (local->fd >= 0) {
-      RemoveEnabledDevice(local->fd);
+#ifdef XFREE86_V4
+	xf86RemoveEnabledDevice(local);
+#else
+	RemoveEnabledDevice(local->fd);
+#endif
     }
     SYSCALL(close(local->fd));
     local->fd = -1;