diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2018-10-20 18:45:55 +0200 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-10-20 18:45:55 +0200 |
commit | 7e4e95897663595323f3bbcf5b75d5bcaf5c1401 (patch) | |
tree | f493393f992822a1763343980aede63ca5e8125e /drivers/pci | |
parent | Merge branch 'remotes/lorenzo/pci/mediatek' (diff) | |
parent | PCI: vmd: Detach resources after stopping root bus (diff) | |
download | linux-7e4e95897663595323f3bbcf5b75d5bcaf5c1401.tar.xz linux-7e4e95897663595323f3bbcf5b75d5bcaf5c1401.zip |
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
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/controller/vmd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c index fd2dbd7eed7b..46ed80f66386 100644 --- 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); } |