Merge branch 'irq/urgent' into irq/core

Merge urgent fixes so pending patches for 4.9 can be applied.
2016-09-20 23:20:32 +02:00
parent 0a30d69195 e875bd66df
commit 464b5847e6
262 changed files with 2549 additions and 1644 deletions
--- 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);
 }