patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / pci / probe.c

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 3a25b3c..736a56f 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -193,7 +193,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
                return;
 
        if (dev->transparent) {
-               printk("Transparent bridge - %s\n", pci_name(dev));
+               printk(KERN_INFO "PCI: Transparent bridge - %s\n", pci_name(dev));
                for(i = 0; i < PCI_BUS_NUM_RESOURCES; i++)
                        child->resource[i] = child->parent->resource[i];
                return;
@@ -366,6 +366,8 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max
                        return max;
                busnr = (buses >> 8) & 0xFF;
                child = pci_alloc_child_bus(bus, dev, busnr);
+               if (!child)
+                       return max;
                child->primary = buses & 0xFF;
                child->subordinate = (buses >> 16) & 0xFF;
                child->bridge_ctl = bctl;