diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-20 16:58:59 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-20 16:58:59 +0200 |
| commit | 41a66072c32978ff3914fd6be88f7592ef64bef7 (patch) | |
| tree | 0f38ef433f0feea3e58f61f8d5397cd9bf065559 /drivers/pci/remove.c | |
| parent | 5465fe0fc3316f7cdda66732a7986f4ebe76d949 (diff) | |
| parent | 7597cdc066313bfd211cca2f9252dfeb41271391 (diff) | |
Merge branch 'efi/urgent' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/pci/remove.c')
| -rw-r--r-- | drivers/pci/remove.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index d1ef7acf6930..f9357e09e9b3 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c @@ -40,6 +40,7 @@ static void pci_destroy_dev(struct pci_dev *dev) list_del(&dev->bus_list); up_write(&pci_bus_sem); + pci_bridge_d3_device_removed(dev); pci_free_resources(dev); put_device(&dev->dev); } @@ -96,8 +97,6 @@ static void pci_remove_bus_device(struct pci_dev *dev) dev->subordinate = NULL; } - pci_bridge_d3_device_removed(dev); - pci_destroy_dev(dev); } |