Patchwork [part4,02/11] PCI: Correctly clean up pci root buses in function pci_remove_bus()

login
register
mail settings
Submitter Yinghai Lu
Date Sept. 2, 2012, 9:54 p.m.
Message ID <1346622861-30865-3-git-send-email-yinghai@kernel.org>
Download mbox | patch
Permalink /patch/181260/
State Superseded
Headers show

Comments

Yinghai Lu - Sept. 2, 2012, 9:54 p.m.
From: Jiang Liu <jiang.liu@huawei.com>

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 <jiang.liu@huawei.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
 drivers/pci/remove.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

Patch

diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index aaae16e..b9f553b 100644
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -48,11 +48,10 @@  void pci_remove_bus(struct pci_bus *bus)
 	list_del(&bus->node);
 	pci_bus_release_busn_res(bus);
 	up_write(&pci_bus_sem);
-	if (!bus->is_added)
-		return;
-
-	pci_remove_legacy_files(bus);
-	device_unregister(&bus->dev);
+	if (bus->is_added || pci_is_root_bus(bus)) {
+		pci_remove_legacy_files(bus);
+		device_unregister(&bus->dev);
+	}
 }
 EXPORT_SYMBOL(pci_remove_bus);