Commit 96b58526 authored by Linus Torvalds's avatar Linus Torvalds

Revert "ACPI / hotplug / PCI: Runtime resume bridge before rescan"

This reverts commit 16468c78.

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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4620a06e
...@@ -675,8 +675,6 @@ static void acpiphp_check_bridge(struct acpiphp_bridge *bridge) ...@@ -675,8 +675,6 @@ static void acpiphp_check_bridge(struct acpiphp_bridge *bridge)
if (bridge->is_going_away) if (bridge->is_going_away)
return; return;
pm_runtime_get_sync(&bridge->pci_dev->dev);
list_for_each_entry(slot, &bridge->slots, node) { list_for_each_entry(slot, &bridge->slots, node) {
struct pci_bus *bus = slot->bus; struct pci_bus *bus = slot->bus;
struct pci_dev *dev, *tmp; struct pci_dev *dev, *tmp;
...@@ -696,8 +694,6 @@ static void acpiphp_check_bridge(struct acpiphp_bridge *bridge) ...@@ -696,8 +694,6 @@ static void acpiphp_check_bridge(struct acpiphp_bridge *bridge)
disable_slot(slot); disable_slot(slot);
} }
} }
pm_runtime_put(&bridge->pci_dev->dev);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment