summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-02-23 20:18:59 -0700
committerBjorn Helgaas <bhelgaas@google.com>2012-02-23 20:18:59 -0700
commita5390aa6dc3646b08bed421944cef0daf78ab994 (patch)
treec7c84410c2db3ca93e912135cd3c1722d4b644ac
parent844393f4c5e309dd262b27796471c47e348b57a8 (diff)
downloadlinux-3.10-a5390aa6dc3646b08bed421944cef0daf78ab994.tar.gz
linux-3.10-a5390aa6dc3646b08bed421944cef0daf78ab994.tar.bz2
linux-3.10-a5390aa6dc3646b08bed421944cef0daf78ab994.zip
PCI: don't publish new root bus until it's fully initialized
When pci_create_root_bus() adds the new struct pci_bus to the global pci_root_buses list, the bus becomes visible to other parts of the kernel, so it should be fully initialized. This patch delays adding the bus to the pci_root_buses list until after all the struct pci_bus initialization is finished. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-rw-r--r--drivers/pci/probe.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index dc904bd4b56..e4c0d1c6324 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1569,10 +1569,6 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
goto err_out;
}
- down_write(&pci_bus_sem);
- list_add_tail(&b->node, &pci_root_buses);
- up_write(&pci_bus_sem);
-
dev->parent = parent;
dev->release = pci_release_bus_bridge_dev;
dev_set_name(dev, "pci%04x:%02x", pci_domain_nr(b), bus);
@@ -1612,6 +1608,10 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
dev_info(&b->dev, "root bus resource %pR\n", res);
}
+ down_write(&pci_bus_sem);
+ list_add_tail(&b->node, &pci_root_buses);
+ up_write(&pci_bus_sem);
+
return b;
class_dev_reg_err: