diff options
| -rw-r--r-- | drivers/pci/probe.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index c84900da3c59..44cbbbaa499d 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
| @@ -764,6 +764,8 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, | |||
| 764 | if (pci_find_bus(pci_domain_nr(bus), max+1)) | 764 | if (pci_find_bus(pci_domain_nr(bus), max+1)) |
| 765 | goto out; | 765 | goto out; |
| 766 | child = pci_add_new_bus(bus, dev, ++max); | 766 | child = pci_add_new_bus(bus, dev, ++max); |
| 767 | if (!child) | ||
| 768 | goto out; | ||
| 767 | buses = (buses & 0xff000000) | 769 | buses = (buses & 0xff000000) |
| 768 | | ((unsigned int)(child->primary) << 0) | 770 | | ((unsigned int)(child->primary) << 0) |
| 769 | | ((unsigned int)(child->secondary) << 8) | 771 | | ((unsigned int)(child->secondary) << 8) |
| @@ -777,7 +779,7 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, | |||
| 777 | buses &= ~0xff000000; | 779 | buses &= ~0xff000000; |
| 778 | buses |= CARDBUS_LATENCY_TIMER << 24; | 780 | buses |= CARDBUS_LATENCY_TIMER << 24; |
| 779 | } | 781 | } |
| 780 | 782 | ||
| 781 | /* | 783 | /* |
| 782 | * We need to blast all three values with a single write. | 784 | * We need to blast all three values with a single write. |
| 783 | */ | 785 | */ |
