diff --git a/[refs] b/[refs] index af61010f8457..0dbfccae9263 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11df1f05514beaf0269484191007dbc8d47e0e6f +refs/heads/master: 2b56313448bb8efad3af19f211d988c8352ac04d diff --git a/trunk/drivers/pci/remove.c b/trunk/drivers/pci/remove.c index 042e08924421..caf8e1eae45e 100644 --- a/trunk/drivers/pci/remove.c +++ b/trunk/drivers/pci/remove.c @@ -71,6 +71,9 @@ void pci_remove_bus(struct pci_bus *pci_bus) down_write(&pci_bus_sem); list_del(&pci_bus->node); up_write(&pci_bus_sem); + if (!pci_bus->is_added) + return; + pci_remove_legacy_files(pci_bus); device_remove_file(&pci_bus->dev, &dev_attr_cpuaffinity); device_remove_file(&pci_bus->dev, &dev_attr_cpulistaffinity);