From: klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 14 Dec 2006 08:47:45 +0000 (+0000)
Subject: Merge R8 track #8354: SupportPalette() algorithm incorrect
X-Git-Tag: edk2-stable201903~23777
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=d43eee260fdd3080c85a7d6860c19100d7e48e6b

Merge R8 track #8354: SupportPalette() algorithm incorrect

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2100 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciIo.c b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciIo.c
index e01d6aa7f0..040c57095d 100644
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciIo.c
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciIo.c
@@ -1346,7 +1346,7 @@ Returns:
   // decode
   //
             
-  if (Temp->BusNumber > PciIoDevice->BusNumber) {
+  if (Temp->BusNumber < PciIoDevice->BusNumber) {
     //
     // GFX should be set to decode
     //
@@ -1971,9 +1971,5 @@ Returns:
     return TRUE;
   }
 
-  if (PciDevice1->BusNumber > PciDevice2->BusNumber) {
-    return PciDeviceExisted (PciDevice1->Parent, PciDevice2);
-  }
-
-  return PciDeviceExisted (PciDevice2->Parent, PciDevice1);
+  return (PciDeviceExisted (PciDevice1->Parent, PciDevice2)|| PciDeviceExisted (PciDevice2->Parent, PciDevice1));
 }