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

Commit 7b95bc60 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "pci: framework: skip PCI restore in pci_pm_resume if no_d3hot is set"

parents e939baa8 0dc84b8c

drivers/pci/pci-driver.c

+4 −0
Original line number Diff line number Diff line
@@ -908,6 +908,9 @@ static int pci_pm_resume(struct device *dev) 
	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;

	int error = 0;



	if (pci_dev->no_d3hot)

		goto skip_pci_pm_restore;



	/*

	 * This is necessary for the suspend error path in which resume is

	 * called without restoring the standard config registers of the device.
@@ -915,6 +918,7 @@ static int pci_pm_resume(struct device *dev) 
	if (pci_dev->state_saved)

		pci_restore_standard_config(pci_dev);



skip_pci_pm_restore:

	if (pci_has_legacy_pm_support(pci_dev))

		return pci_legacy_resume(dev);