Skip to content

Commit

Permalink
Revert "ACPI / hotplug / PCI: Runtime resume bridge before rescan"
Browse files Browse the repository at this point in the history
This reverts commit 16468c7.

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>
  • Loading branch information
Linus Torvalds committed Aug 4, 2016
1 parent 4620a06 commit 96b5852
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions drivers/pci/hotplug/acpiphp_glue.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -696,8 +694,6 @@ static void acpiphp_check_bridge(struct acpiphp_bridge *bridge)
disable_slot(slot);
}
}

pm_runtime_put(&bridge->pci_dev->dev);
}

/*
Expand Down

0 comments on commit 96b5852

Please sign in to comment.