Merge tag 'powerpc-5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-2.6-microblaze.git] / arch / s390 / pci / pci.c

diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index 6e57ff8..4b62d6b 100644 (file)
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -678,8 +678,11 @@ void zpci_remove_device(struct zpci_dev *zdev)
        struct pci_dev *pdev;
 
        pdev = pci_get_slot(zbus->bus, zdev->devfn);
-       if (pdev)
+       if (pdev) {
+               if (pdev->is_virtfn)
+                       return zpci_remove_virtfn(pdev, zdev->vfn);
                pci_stop_and_remove_bus_device_locked(pdev);
+       }
 }
 
 int zpci_create_device(struct zpci_dev *zdev)