OcAppleKernelLib: Correct CustomPciSerialDevice patch, thanks @joevt

Reference: acidanthera/bugtracker#2003
acidanthera · May 3, 2022 · a825d00 · a825d00
1 parent 72ebddc
commit a825d00
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Library/OcAppleKernelLib/CommonPatches.c b/Library/OcAppleKernelLib/CommonPatches.c
@@ -1207,7 +1207,7 @@ PatchCustomPciSerialDevice (
   EFI_STATUS  Status;
 
   Status = EFI_INVALID_PARAMETER;
-  if (  ((mPmioRegisterBase != 0) && (mPmioRegisterStride > 1))
+  if (  ((mPmioRegisterBase != 0) && (mPmioRegisterStride != 0))
      && ((mPmioRegisterBase + 7U * mPmioRegisterStride) <= MAX_UINT16))
   {
     Status = PatchCustomPciSerialPmio (Patcher);

diff --git a/Library/OcMainLib/OpenCoreKernelPatch.c b/Library/OcMainLib/OpenCoreKernelPatch.c
@@ -323,8 +323,8 @@ OcKernelApplyPatches (
     if (Config->Misc.Serial.Override && Config->Kernel.Quirks.CustomPciSerialDevice) {
       RegisterBase   = GetSerialRegisterBase ();
       RegisterStride = PatchPcdGet32 (PcdSerialRegisterStride);
-      if (  ((RegisterBase != 0) && (RegisterStride > 1))
-         && (RegisterBase != 0x3F8U))
+      if (  ((RegisterBase != 0 && RegisterStride != 0))
+         && (RegisterBase != 0x3F8U || RegisterStride != 1))
       {
         PatchSetPciSerialDevice (RegisterBase, RegisterStride);
         OcKernelApplyQuirk (KernelQuirkCustomPciSerialDevice, CacheType, DarwinVersion, NULL, &KernelPatcher);