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

Commit 683dc9aa authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: pcie: change PCIe to suspend after suspend_noirq"

parents 29b5b887 e57aa240

drivers/pci/host/pci-msm.c

+3 −3
Original line number Diff line number Diff line
@@ -6301,7 +6301,7 @@ static int msm_pcie_pm_suspend(struct pci_dev *dev, 
	return ret;

}



static void msm_pcie_fixup_suspend(struct pci_dev *dev)

static void msm_pcie_fixup_suspend_late(struct pci_dev *dev)

{

	int ret;

	struct msm_pcie_dev_t *pcie_dev = PCIE_BUS_PRIV_DATA(dev->bus);
@@ -6334,8 +6334,8 @@ static void msm_pcie_fixup_suspend(struct pci_dev *dev) 


	mutex_unlock(&pcie_dev->recovery_lock);

}

DECLARE_PCI_FIXUP_SUSPEND(PCIE_VENDOR_ID_QCOM, PCI_ANY_ID,

			  msm_pcie_fixup_suspend);

DECLARE_PCI_FIXUP_SUSPEND_LATE(PCIE_VENDOR_ID_QCOM, PCI_ANY_ID,

			  msm_pcie_fixup_suspend_late);



/* Resume the PCIe link */

static int msm_pcie_pm_resume(struct pci_dev *dev,