diff options
| author | tsi <tsi> | 2008-06-19 16:37:45 +0000 |
|---|---|---|
| committer | tsi <tsi> | 2008-06-19 16:37:45 +0000 |
| commit | e9549a3f1a2abf90db8a7245d12f38faf41226e8 (patch) | |
| tree | 38d59eb4ac3b9146d1111894d7b075186dc857ae | |
| parent | 679c4af1b08713d7dbbcc4360c8fa454e815a6df (diff) | |
53. Fix bug that caused the PCI scan to ignore bus segments that are known to
before the scan starts (Marc La France).
| -rw-r--r-- | programs/Xserver/hw/xfree86/CHANGELOG | 4 | ||||
| -rw-r--r-- | programs/Xserver/hw/xfree86/os-support/bus/Pci.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG index eb13feb71..b5e8a15cb 100644 --- a/programs/Xserver/hw/xfree86/CHANGELOG +++ b/programs/Xserver/hw/xfree86/CHANGELOG @@ -1,4 +1,6 @@ XFree86 4.7.99.20 (xx June 2008) + 53. Fix bug that caused the PCI scan to ignore bus segments that are known to + before the scan starts (Marc La France). XFree86 4.7.99.19 (9 June 2008) @@ -20761,4 +20763,4 @@ XFree86 3.0a (28 April 1994) XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3964 2008/05/23 11:03:20 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3965 2008/06/09 11:02:59 dawes Exp $ diff --git a/programs/Xserver/hw/xfree86/os-support/bus/Pci.c b/programs/Xserver/hw/xfree86/os-support/bus/Pci.c index 72c0fb5d8..5dc391cd7 100644 --- a/programs/Xserver/hw/xfree86/os-support/bus/Pci.c +++ b/programs/Xserver/hw/xfree86/os-support/bus/Pci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c,v 1.101tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c,v 1.102tsi Exp $ */ /* * Pci.c - New server PCI access functions * @@ -911,7 +911,8 @@ pciGenFindNext(void) *pciBusInfo[pciBusNum] = *pciBusInfo[previousBus]; speculativeProbe = TRUE; - } + } else if (pciBusInfo[pciBusNum]->pciMaxOffset == 0) + pciBusInfo[pciBusNum]->pciMaxOffset = 256; /* * At this point, pciBusNum, pciDevNum, and pciFuncNum have been |