iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pci/yinghai-misc' into next

Browse Source
This commit is contained in:
Bjorn Helgaas
2012-09-24 17:24:11 -06:00
parent d3ce52f50c 84544a1dea
commit 78c8f84302
5 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/pci/probe.c
View File

@ -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;
}