Changeset 53483 in vbox

Timestamp:

Dec 8, 2014 4:57:07 PM (10 years ago)

Author:

vboxsync

Message:

Additions/VBoxGuest: never do input_free_device() after input_unregister_device()

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c

@@ -134 +134 @@
 #ifdef VBOXGUEST_WITH_INPUT_DRIVER
 static struct input_dev        *g_pInputDevice = NULL;
+static bool                     g_fInputDeviceRegistered = false;
 #endif
 
@@ -451 +452 @@
             return rc;
         }
+        g_fInputDeviceRegistered = true;
     }
     /* Do what one of our competitors apparently does as that works. */
@@ -475 +477 @@
 {
     VbglGRFree(&g_pMouseStatusReq->header);
-    input_unregister_device(g_pInputDevice);
-    input_free_device(g_pInputDevice);
+    /* see documentation of input_register_device() */
+    if (g_fInputDeviceRegistered)
+        input_unregister_device(g_pInputDevice);
+    else
+        input_free_device(g_pInputDevice);
 }
 #endif