fix: allocate multitouch interface correctly, fixes #7, fixes #3

* also check for the command gate so we don't try to do things after we've already stopped
lazd · Jan 8, 2020 · 9451dbe · 9451dbe
1 parent fbd2377
commit 9451dbe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/VoodooI2CGoodix/VoodooI2CGoodixEventDriver.cpp b/VoodooI2CGoodix/VoodooI2CGoodixEventDriver.cpp
@@ -203,7 +203,7 @@ void VoodooI2CGoodixEventDriver::handleStop(IOService* provider) {
 }
 
 IOReturn VoodooI2CGoodixEventDriver::publishMultitouchInterface() {
-    multitouch_interface = new VoodooI2CMultitouchInterface();
+    multitouch_interface = OSTypeAlloc(VoodooI2CMultitouchInterface);
     if (!multitouch_interface) {
         IOLog("%s::No memory to allocate VoodooI2CMultitouchInterface instance\n", getName());
         goto multitouch_exit;

diff --git a/VoodooI2CGoodix/VoodooI2CGoodixTouchDriver.cpp b/VoodooI2CGoodix/VoodooI2CGoodixTouchDriver.cpp
@@ -235,6 +235,10 @@ void VoodooI2CGoodixTouchDriver::handle_input_threaded() {
         read_in_progress = false;
         return;
     }
+    if (!command_gate) {
+        read_in_progress = false;
+        return;
+    }
     command_gate->attemptAction(OSMemberFunctionCast(IOCommandGate::Action, this, &VoodooI2CGoodixTouchDriver::goodix_process_events));
     read_in_progress = false;
 }