浏览代码

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
Bjorn Helgaas 6 年之前
父节点
当前提交
7e4e958976
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      drivers/pci/controller/vmd.c

+ 1 - 1
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);
 	struct vmd_dev *vmd = pci_get_drvdata(dev);
 
 
-	vmd_detach_resources(vmd);
 	sysfs_remove_link(&vmd->dev->dev.kobj, "domain");
 	sysfs_remove_link(&vmd->dev->dev.kobj, "domain");
 	pci_stop_root_bus(vmd->bus);
 	pci_stop_root_bus(vmd->bus);
 	pci_remove_root_bus(vmd->bus);
 	pci_remove_root_bus(vmd->bus);
 	vmd_cleanup_srcu(vmd);
 	vmd_cleanup_srcu(vmd);
 	vmd_teardown_dma_ops(vmd);
 	vmd_teardown_dma_ops(vmd);
+	vmd_detach_resources(vmd);
 	irq_domain_remove(vmd->irq_domain);
 	irq_domain_remove(vmd->irq_domain);
 }
 }