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 e01d6aa7f0cb291f55c1da03a686a9198248dd17..040c57095d866b244481e6c129ee480e4524c5db 100644 (file)
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciIo.c
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciIo.c
@@ -1346,7 +1346,7 @@ Returns:
   // decode\r
   //\r
             \r
-  if (Temp->BusNumber > PciIoDevice->BusNumber) {\r
+  if (Temp->BusNumber < PciIoDevice->BusNumber) {\r
     //\r
     // GFX should be set to decode\r
     //\r
@@ -1971,9 +1971,5 @@ Returns:
     return TRUE;\r
   }\r
 \r
-  if (PciDevice1->BusNumber > PciDevice2->BusNumber) {\r
-    return PciDeviceExisted (PciDevice1->Parent, PciDevice2);\r
-  }\r
-\r
-  return PciDeviceExisted (PciDevice2->Parent, PciDevice1);\r
+  return (PciDeviceExisted (PciDevice1->Parent, PciDevice2)|| PciDeviceExisted (PciDevice2->Parent, PciDevice1));\r
 }\r