VBoxGuest

Timestamp:

Dec 9, 2014 8:09:27 AM (10 years ago)

Author:

vboxsync

Message:

Additions/VBoxGuest: simlify the fix

File:

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

-              r53483
+              r53484
 #ifdef VBOXGUEST_WITH_INPUT_DRIVER
 static struct input_dev        *g_pInputDevice = NULL;
-static bool                     g_fInputDeviceRegistered = false;
 #endif
 …
             return rc;
+        }
-        g_fInputDeviceRegistered = true;
+    }
     /* Do what one of our competitors apparently does as that works. */
 …
+{
     VbglGRFree(&g_pMouseStatusReq->header);
+    /* see documentation of input_register_device() */
+    if (g_fInputDeviceRegistered)
+        input_unregister_device(g_pInputDevice);
+    else
+        input_free_device(g_pInputDevice);
+}
+#endif
+    /* See documentation of input_register_device(): input_free_device()
+     * should not be called after a device has been registered. */
+    input_unregister_device(g_pInputDevice);
+}
+#endif /* VBOXGUEST_WITH_INPUT_DRIVER */

Note: See TracChangeset for help on using the changeset viewer.