[PATCH joystick] Remove old input ABI leftovers from jstkCoreUnInit

Timo Aaltonen tjaalton at ubuntu.com
Fri Mar 18 10:13:38 PDT 2011


From: Timo Aaltonen <timo.aaltonen at canonical.com>

Fixes crashes on device unplug:
https://bugs.freedesktop.org/show_bug.cgi?id=35391

Signed-off-by: Timo Aaltonen <timo.aaltonen at canonical.com>
---
 src/jstk.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/src/jstk.c b/src/jstk.c
index 9796a46..41cace7 100644
--- a/src/jstk.c
+++ b/src/jstk.c
@@ -622,13 +622,6 @@ jstkCoreUnInit(InputDriverPtr    drv,
 {
     JoystickDevPtr device = (JoystickDevPtr) pInfo->private;
 
-    if (device->keyboard_device != NULL)
-    {
-        xf86DisableDevice(device->keyboard_device->dev, TRUE);
-        device->keyboard_device = NULL;
-    }
-
-    free (device);
     pInfo->private = NULL;
     xf86DeleteInput(pInfo, 0);
 }
-- 
1.7.4.1



More information about the xorg-devel mailing list