summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-06-04 13:49:03 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-06-04 13:49:02 -0700
commit5ae645ca395cea144eb07445e304dcfe9769bd2e (patch)
treede844f603566e77c044c934d0a187000d627012c /drivers
parent7c542d932b342bd0f239c380002b6529af17c902 (diff)
parent0ea189e015dc599e3ef3ba6cc582aa80d3eacab3 (diff)
Merge "msm: pcie: change PCIe to suspend after suspend_noirq"
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/host/pci-msm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/host/pci-msm.c b/drivers/pci/host/pci-msm.c
index e01ea16d8db2..b180e67acafb 100644
--- a/drivers/pci/host/pci-msm.c
+++ b/drivers/pci/host/pci-msm.c
@@ -6812,7 +6812,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);
@@ -6844,8 +6844,8 @@ static void msm_pcie_fixup_suspend(struct pci_dev *dev)
mutex_unlock(&pcie_dev->recovery_lock);
}
-DECLARE_PCI_FIXUP_SUSPEND(PCIE_VENDOR_ID_RCP, PCIE_DEVICE_ID_RCP,
- msm_pcie_fixup_suspend);
+DECLARE_PCI_FIXUP_SUSPEND_LATE(PCIE_VENDOR_ID_RCP, PCIE_DEVICE_ID_RCP,
+ msm_pcie_fixup_suspend_late);
/* Resume the PCIe link */
static int msm_pcie_pm_resume(struct pci_dev *dev,