[PATCH] acpi bridge hotadd: Make the PCI remove routines safe for failed hot-plug
When a root bridge hierarchy is hot-plugged, resource requirements for the new devices may be greater than what the root bridge is decoding. In this case, we want to remove devices that did not get needed resources. These devices have been scanned into bus specific lists but not yet added to the global device list. Make sure the pci remove functions can handle this case. Signed-off-by: Rajesh Shah <rajesh.shah@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
6ef6f0e33c
commit
091ca9f063
1 changed files with 9 additions and 5 deletions
|
@ -18,17 +18,21 @@ static void pci_free_resources(struct pci_dev *dev)
|
|||
|
||||
static void pci_destroy_dev(struct pci_dev *dev)
|
||||
{
|
||||
pci_proc_detach_device(dev);
|
||||
pci_remove_sysfs_dev_files(dev);
|
||||
device_unregister(&dev->dev);
|
||||
if (!list_empty(&dev->global_list)) {
|
||||
pci_proc_detach_device(dev);
|
||||
pci_remove_sysfs_dev_files(dev);
|
||||
device_unregister(&dev->dev);
|
||||
spin_lock(&pci_bus_lock);
|
||||
list_del(&dev->global_list);
|
||||
dev->global_list.next = dev->global_list.prev = NULL;
|
||||
spin_unlock(&pci_bus_lock);
|
||||
}
|
||||
|
||||
/* Remove the device from the device lists, and prevent any further
|
||||
* list accesses from this device */
|
||||
spin_lock(&pci_bus_lock);
|
||||
list_del(&dev->bus_list);
|
||||
list_del(&dev->global_list);
|
||||
dev->bus_list.next = dev->bus_list.prev = NULL;
|
||||
dev->global_list.next = dev->global_list.prev = NULL;
|
||||
spin_unlock(&pci_bus_lock);
|
||||
|
||||
pci_free_resources(dev);
|
||||
|
|
Loading…
Reference in a new issue