Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/pci/hotplug/acpiphp_glue.c

+0 −4
Original line number Diff line number Diff line
@@ -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);

}



/*