summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-05-01 23:56:49 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-05-01 23:56:48 -0700
commite575b75923f07b207b4ba7582cec8c8483c7fe5e (patch)
tree69e9a07aa8f3a6b35dd1ca6e67a8a6eb5ba41078 /drivers/pci
parent1886bd0e4babaf4161ec549a7ceb44202c5ab0b8 (diff)
parent4501fe2b46c34001185d90abffa5de7cb784580b (diff)
Merge "msm: pcie: switch GPIO to sleep state before asserting PERST"
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/host/pci-msm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/host/pci-msm.c b/drivers/pci/host/pci-msm.c
index f364882943e1..243afbe44df3 100644
--- a/drivers/pci/host/pci-msm.c
+++ b/drivers/pci/host/pci-msm.c
@@ -6754,12 +6754,12 @@ static int msm_pcie_pm_suspend(struct pci_dev *dev,
PCIE_DBG(pcie_dev, "RC%d: PM_Enter_L23 is NOT received\n",
pcie_dev->rc_idx);
- msm_pcie_disable(pcie_dev, PM_PIPE_CLK | PM_CLK | PM_VREG);
-
if (pcie_dev->use_pinctrl && pcie_dev->pins_sleep)
pinctrl_select_state(pcie_dev->pinctrl,
pcie_dev->pins_sleep);
+ msm_pcie_disable(pcie_dev, PM_PIPE_CLK | PM_CLK | PM_VREG);
+
PCIE_DBG(pcie_dev, "RC%d: exit\n", pcie_dev->rc_idx);
return ret;