Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6.

1 files changed, 9 insertions, 5 deletions

diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index 96f077f9a659..27a294b6965d 100644
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -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);