Skip to content

Commit

Permalink
Merge branch 'remotes/lorenzo/pci/vmd'
Browse files Browse the repository at this point in the history
  - 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
  • Loading branch information
Bjorn Helgaas committed Oct 20, 2018
2 parents 4dd4d99 + dc8af3a commit 7e4e958
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/pci/controller/vmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down

0 comments on commit 7e4e958

Please sign in to comment.