diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-25 03:24:11 +0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-25 03:24:11 +0400 |
| commit | 78c8f84302ce007aedcfa11912fd4aacf22727ab (patch) | |
| tree | f7a699c34875cd33c2e6c1301b740adb0ba4054f /drivers/pci/probe.c | |
| parent | d3ce52f50cc1697504130897f1d7c489b62dae1c (diff) | |
| parent | 84544a1dea61879edebceddb7a76d5737409f8c8 (diff) | |
| download | linux-78c8f84302ce007aedcfa11912fd4aacf22727ab.tar.xz | |
Merge branch 'pci/yinghai-misc' into next
Diffstat (limited to 'drivers/pci/probe.c')
| -rw-r--r-- | drivers/pci/probe.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 23961117663f..ec909afa90b6 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -729,8 +729,10 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, /* Check if setup is sensible at all */ if (!pass && - (primary != bus->number || secondary <= bus->number)) { - dev_dbg(&dev->dev, "bus configuration invalid, reconfiguring\n"); + (primary != bus->number || secondary <= bus->number || + secondary > subordinate)) { + dev_info(&dev->dev, "bridge configuration invalid ([bus %02x-%02x]), reconfiguring\n", + secondary, subordinate); broken = 1; } |