diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-19 07:12:41 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-19 07:12:41 (GMT) |
commit | c51f2ff0075b77f272da93b7155aa666a77c8fe7 (patch) | |
tree | f229265a8d4b0407f2eaaa4fb6d1afb86ac380c5 /drivers/pci/remove.c | |
parent | eddde288957957d45c42fcf51af9a059de7e0887 (diff) | |
parent | 3be7988674ab33565700a37b210f502563d932e6 (diff) | |
download | linux-c51f2ff0075b77f272da93b7155aa666a77c8fe7.tar.xz |
Merge 4.8-rc7 into usb-next
We want/need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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 d1ef7ac..f9357e0 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); } |