diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-03 22:20:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-03 22:20:22 -0400 |
| commit | 96b585267f552d4b6a28ea8bd75e5ed03deb6e71 (patch) | |
| tree | 169512fc4834a474ae2dbd430269d72e6bb12428 | |
| parent | 4620a06e4b3c5d076feb9a42ab43dce77c385358 (diff) | |
| download | linux-96b585267f552d4b6a28ea8bd75e5ed03deb6e71.tar.bz2 | |
Revert "ACPI / hotplug / PCI: Runtime resume bridge before rescan"
This reverts commit 16468c783cb4cf72475dcda23fabecb4a4bb0e17.
Bisection showed that it was the root cause for a resume hang on a
bog-standard all-Intel laptop (Sony Vaio Pro 11), and reverting fixes
the hang.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index 6a33ddcfa20b..fa49f9143b80 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -675,8 +675,6 @@ static void acpiphp_check_bridge(struct acpiphp_bridge *bridge) if (bridge->is_going_away) return; - pm_runtime_get_sync(&bridge->pci_dev->dev); - list_for_each_entry(slot, &bridge->slots, node) { struct pci_bus *bus = slot->bus; struct pci_dev *dev, *tmp; @@ -696,8 +694,6 @@ static void acpiphp_check_bridge(struct acpiphp_bridge *bridge) disable_slot(slot); } } - - pm_runtime_put(&bridge->pci_dev->dev); } /* |