Merge branch 'remotes/lorenzo/pci/vmd'

  - Detach VMD resources after stopping root bus to prevent orphan
    resources (Jon Derrick)

* remotes/lorenzo/pci/vmd:
  PCI: vmd: Detach resources after stopping root bus

diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c
index fd2dbd7eed7bca808f44470ba060725acc1ec061..46ed80f663860589321b25409a3488649b87f434 100644 (file)
--- a/drivers/pci/controller/vmd.c
+++ b/drivers/pci/controller/vmd.c
@@ -813,12 +813,12 @@ static void vmd_remove(struct pci_dev *dev)
 {
        struct vmd_dev *vmd = pci_get_drvdata(dev);
 
-       vmd_detach_resources(vmd);
        sysfs_remove_link(&vmd->dev->dev.kobj, "domain");
        pci_stop_root_bus(vmd->bus);
        pci_remove_root_bus(vmd->bus);
        vmd_cleanup_srcu(vmd);
        vmd_teardown_dma_ops(vmd);
+       vmd_detach_resources(vmd);
        irq_domain_remove(vmd->irq_domain);
 }