Fix sleep

VoodooSMBus · Jun 16, 2020 · cd94edb · cd94edb
1 parent 158ebf0
commit cd94edb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/VoodooRMI/Functions/F01.cpp b/VoodooRMI/Functions/F01.cpp
@@ -394,7 +394,7 @@ int F01::rmi_f01_suspend()
     old_nosleep = device_control->ctrl0 & RMI_F01_CTRL0_NOSLEEP_BIT;
     device_control->ctrl0 &= ~RMI_F01_CTRL0_NOSLEEP_BIT;
 
-    device_control->ctrl0 *= ~RMI_F01_CTRL0_SLEEP_MODE_MASK;
+    device_control->ctrl0 &= ~RMI_F01_CTRL0_SLEEP_MODE_MASK;
     if ((false) /* device may wakeup = false*/)
         device_control->ctrl0 |= RMI_SLEEP_MODE_RESERVED1;
     else

diff --git a/VoodooRMI/Functions/F11.cpp b/VoodooRMI/Functions/F11.cpp
@@ -159,7 +159,7 @@ bool F11::getReport()
 
     if (error < 0)
     {
-        IOLogError("Could not read F11 attention data: %02X", error);
+        IOLogError("Could not read F11 attention data: %d", error);
         return false;
     }
 

diff --git a/VoodooRMI/RMIBus.cpp b/VoodooRMI/RMIBus.cpp
@@ -163,9 +163,9 @@ IOReturn RMIBus::setPowerState(unsigned long whichState, IOService* whatDevice)
 
     if (whichState == 0 && awake) {
         IOLogDebug("Sleep");
-        IOReturn error = messageClients(kHandleRMISuspend);
+        messageClients(kHandleRMISuspend);
         rmi_driver_clear_irq_bits(this);
-        if (!error) awake = false;
+        awake = false;
     } else if (!awake) {
         IOSleep(1000);
         IOLogDebug("Wakeup");
@@ -181,8 +181,8 @@ IOReturn RMIBus::setPowerState(unsigned long whichState, IOService* whatDevice)
             return 0;
         });
         rmi_driver_set_irq_bits(this);
-        IOReturn error = messageClients(kHandleRMIResume);
-        if (!error) awake = true;
+        messageClients(kHandleRMIResume);
+        awake = true;
     }
 
     return kIOPMAckImplied;