diff options
Diffstat (limited to 'hw/xfree86/common/xf86pciBus.c')
-rw-r--r-- | hw/xfree86/common/xf86pciBus.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index 641d1c919..790bf7409 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -310,7 +310,7 @@ FindPCIVideoInfo(void) (memType)PCIGETMEMORY64HIGH(pcrp->pci_base1) << 32; #else if (pcrp->pci_base1) - info->memBase[0] = 0; + info->memBase[0] = 0; #endif } } @@ -910,10 +910,15 @@ removeOverlapsWithBridges(int busIndex, resPtr target) { PciBusPtr pbp; resPtr tmp,bridgeRes = NULL; - resRange range = target->val; + resRange range; + if (!target) + return; + if (!ResCanOverlap(&target->val)) return; + + range = target->val; for (pbp=xf86PciBus; pbp; pbp = pbp->next) { if (pbp->primary == busIndex) { |