Browse Source

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>
Linus Torvalds 9 years ago
parent
commit
96b585267f
1 changed files with 0 additions and 4 deletions
  1. 0 4
      drivers/pci/hotplug/acpiphp_glue.c

+ 0 - 4
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);
 }
 
 /*