Merge branch 'linus'

1 files changed, 20 insertions, 14 deletions

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index adfad4fd6a13..a10ed9dab2c2 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -33,10 +33,9 @@ LIST_HEAD(pci_devices);
  */
 static void pci_create_legacy_files(struct pci_bus *b)
 {
-        b->legacy_io = kmalloc(sizeof(struct bin_attribute) * 2,
+        b->legacy_io = kzalloc(sizeof(struct bin_attribute) * 2,
                                GFP_ATOMIC);
         if (b->legacy_io) {
-                memset(b->legacy_io, 0, sizeof(struct bin_attribute) * 2);
                 b->legacy_io->attr.name = "legacy_io";
                 b->legacy_io->size = 0xffff;
                 b->legacy_io->attr.mode = S_IRUSR | S_IWUSR;
@@ -320,9 +319,8 @@ static struct pci_bus * __devinit pci_alloc_bus(void)
 {
         struct pci_bus *b;
 
-        b = kmalloc(sizeof(*b), GFP_KERNEL);
+        b = kzalloc(sizeof(*b), GFP_KERNEL);
         if (b) {
-                memset(b, 0, sizeof(*b));
                 INIT_LIST_HEAD(&b->node);
                 INIT_LIST_HEAD(&b->children);
                 INIT_LIST_HEAD(&b->devices);
@@ -347,6 +345,7 @@ pci_alloc_child_bus(struct pci_bus *parent, struct pci_dev *bridge, int busnr)
         child->parent = parent;
         child->ops = parent->ops;
         child->sysdata = parent->sysdata;
+        child->bus_flags = parent->bus_flags;
         child->bridge = get_device(&bridge->dev);
 
         child->class_dev.class = &pcibus_class;
@@ -456,7 +455,7 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max
                  * pass and just note the configuration.
                  */
                 if (pass)
-                        return max;
+                        goto out;
                 busnr = (buses >> 8) & 0xFF;
 
                 /*
@@ -466,12 +465,12 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max
                 if (pci_find_bus(pci_domain_nr(bus), busnr)) {
                         printk(KERN_INFO "PCI: Bus %04x:%02x already known\n",
                                         pci_domain_nr(bus), busnr);
-                        return max;
+                        goto out;
                 }
 
                 child = pci_add_new_bus(bus, dev, busnr);
                 if (!child)
-                        return max;
+                        goto out;
                 child->primary = buses & 0xFF;
                 child->subordinate = (buses >> 16) & 0xFF;
                 child->bridge_ctl = bctl;
@@ -496,7 +495,7 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max
                                    bus ranges. */
                                 pci_write_config_dword(dev, PCI_PRIMARY_BUS,
                                                        buses & ~0xffffff);
-                        return max;
+                        goto out;
                 }
 
                 /* Clear errors */
@@ -505,7 +504,7 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max
                 /* Prevent assigning a bus number that already exists.
                  * This can happen when a bridge is hot-plugged */
                 if (pci_find_bus(pci_domain_nr(bus), max+1))
-                        return max;
+                        goto out;
                 child = pci_add_new_bus(bus, dev, ++max);
                 buses = (buses & 0xff000000)
                       | ((unsigned int)(child->primary)     <<  0)
@@ -537,6 +536,11 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max
                         pci_fixup_parent_subordinate_busnr(child, max);
                         /* Now we can scan all subordinate buses... */
                         max = pci_scan_child_bus(child);
+                        /*
+                         * now fix it up again since we have found
+                         * the real value of max.
+                         */
+                        pci_fixup_parent_subordinate_busnr(child, max);
                 } else {
                         /*
                          * For CardBus bridges, we leave 4 bus numbers
@@ -576,8 +580,6 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max
                 pci_write_config_byte(dev, PCI_SUBORDINATE_BUS, max);
         }
 
-        pci_write_config_word(dev, PCI_BRIDGE_CONTROL, bctl);
-
         sprintf(child->name, (is_cardbus ? "PCI CardBus #%02x" : "PCI Bus #%02x"), child->number);
 
         while (bus->parent) {
@@ -585,17 +587,22 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max
                     (child->number > bus->subordinate) ||
                     (child->number < bus->number) ||
                     (child->subordinate < bus->number)) {
-                        printk(KERN_WARNING "PCI: Bus #%02x (-#%02x) may be "
+                        printk(KERN_WARNING "PCI: Bus #%02x (-#%02x) is "
                                "hidden behind%s bridge #%02x (-#%02x)%s\n",
                                child->number, child->subordinate,
                                bus->self->transparent ? " transparent" : " ",
                                bus->number, bus->subordinate,
                                pcibios_assign_all_busses() ? " " :
                                " (try 'pci=assign-busses')");
+                        printk(KERN_WARNING "Please report the result to "
+                               "linux-kernel to fix this permanently\n");
                 }
                 bus = bus->parent;
         }
 
+out:
+        pci_write_config_word(dev, PCI_BRIDGE_CONTROL, bctl);
+
         return max;
 }
 
@@ -788,11 +795,10 @@ pci_scan_device(struct pci_bus *bus, int devfn)
         if (pci_bus_read_config_byte(bus, devfn, PCI_HEADER_TYPE, &hdr_type))
                 return NULL;
 
-        dev = kmalloc(sizeof(struct pci_dev), GFP_KERNEL);
+        dev = kzalloc(sizeof(struct pci_dev), GFP_KERNEL);
         if (!dev)
                 return NULL;
 
-        memset(dev, 0, sizeof(struct pci_dev));
         dev->bus = bus;
         dev->sysdata = bus->sysdata;
         dev->dev.parent = bus->bridge;