Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / pci / pci-sysfs.c

diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index a3cd8cad532ac218c2b1055f21e27d6e2bec696e..a55e248618cd00e7de495a078c3bb59d177123f4 100644 (file)
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -330,7 +330,7 @@ static void remove_callback(struct device *dev)
        struct pci_dev *pdev = to_pci_dev(dev);
 
        mutex_lock(&pci_remove_rescan_mutex);
-       pci_remove_bus_device(pdev);
+       pci_stop_and_remove_bus_device(pdev);
        mutex_unlock(&pci_remove_rescan_mutex);
 }
 
@@ -366,7 +366,10 @@ dev_bus_rescan_store(struct device *dev, struct device_attribute *attr,
 
        if (val) {
                mutex_lock(&pci_remove_rescan_mutex);
-               pci_rescan_bus(bus);
+               if (!pci_is_root_bus(bus) && list_empty(&bus->devices))
+                       pci_rescan_bus_bridge_resize(bus->self);
+               else
+                       pci_rescan_bus(bus);
                mutex_unlock(&pci_remove_rescan_mutex);
        }
        return count;