Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

[mirror_ubuntu-bionic-kernel.git] / arch / powerpc / platforms / pseries / pci_dlpar.c

diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c
index fbb21fc3080b4e130142b03ff2519d79e7a5f545..8b7bafa489c27235d4c65631681fb29cfa71ef8c 100644 (file)
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
@@ -84,7 +84,7 @@ void pcibios_remove_pci_devices(struct pci_bus *bus)
        list_for_each_entry_safe(dev, tmp, &bus->devices, bus_list) {
                pr_debug("     * Removing %s...\n", pci_name(dev));
                eeh_remove_bus_device(dev);
-               pci_remove_bus_device(dev);
+               pci_stop_and_remove_bus_device(dev);
        }
 }
 EXPORT_SYMBOL_GPL(pcibios_remove_pci_devices);