Patchwork [2/7] PCI: Correctly clean up pci root buses in function pci_remove_bus()

mail settings
Submitter Taku Izumi
Date July 4, 2012, 8:07 a.m.
Message ID <>
Download mbox | patch
Permalink /patch/168912/
State Superseded
Headers show


Taku Izumi - July 4, 2012, 8:07 a.m.
From: Jiang Liu <>

    Correctly clean up pci root buses in function pci_remove_bus()
    The function pci_create_root_bus() allocates the pci bus structure,
    registers the bus device and creates the legacy files for a pci root
    bus, but returns without setting the is_added flag. The is_added flag
    for a pci root bus will be set by function pci_scan_child_bus().
    If a pci root bus is destroyed before calling pci_scan_child_bus(),
    the is_added flag will not be set.  So teach function pci_remove_bus()
    to detect such a case and correctly clean up pci root buses.
    Signed-off-by: Jiang Liu <>
    Signed-off-by: Yinghai Lu <>

To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to
More majordomo info at


Index: linux/drivers/pci/remove.c
--- linux.orig/drivers/pci/remove.c	2012-07-04 09:54:52.126485695 +0900
+++ linux/drivers/pci/remove.c	2012-07-04 09:55:33.695965952 +0900
@@ -70,11 +70,10 @@  void pci_remove_bus(struct pci_bus *pci_
-	if (!pci_bus->is_added)
-		return;
-	pci_remove_legacy_files(pci_bus);
-	device_unregister(&pci_bus->dev);
+	if (pci_bus->is_added || pci_is_root_bus(pci_bus)) {
+		pci_remove_legacy_files(pci_bus);
+		device_unregister(&pci_bus->dev);
+	}