From patchwork Wed Jul 4 08:07:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/7] PCI: Correctly clean up pci root buses in function pci_remove_bus() Date: Tue, 03 Jul 2012 22:07:07 -0000 From: Taku Izumi X-Patchwork-Id: 168912 Message-Id: <20120704170707.9303dc62.izumi.taku@jp.fujitsu.com> To: Taku Izumi Cc: linux-pci@vger.kernel.org, Bjorn Helgaas , Kenji Kaneshige , Yinghai Lu , Jiang Liu 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 majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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_ list_del(&pci_bus->node); pci_bus_release_busn_res(pci_bus); up_write(&pci_bus_sem); - 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); + } } EXPORT_SYMBOL(pci_remove_bus);