summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorklu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>2006-12-14 08:47:45 +0000
committerklu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>2006-12-14 08:47:45 +0000
commitd43eee260fdd3080c85a7d6860c19100d7e48e6b (patch)
treee9b810ca6da655afb7812ff9eaec2915ca86b29f
parent4ef4e1eab529c7d23100643705ee0df0b027f12c (diff)
downloadedk2-d43eee260fdd3080c85a7d6860c19100d7e48e6b.tar.gz
edk2-d43eee260fdd3080c85a7d6860c19100d7e48e6b.tar.bz2
edk2-d43eee260fdd3080c85a7d6860c19100d7e48e6b.zip
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
-rw-r--r--EdkModulePkg/Bus/Pci/PciBus/Dxe/PciIo.c8
1 files changed, 2 insertions, 6 deletions
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));
}