diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2020-08-05 18:24:20 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-08-05 18:24:20 -0500 |
| commit | 21c04e050e5c2c694b8d643d8ec62b0704627fad (patch) | |
| tree | 5d1d93f4e90ff833216c883d7a6820d518963932 /drivers/pci/controller/cadence | |
| parent | a07a20b191c678be2cf1deec7db826e0aba08749 (diff) | |
| parent | a68e06e729b1b06c50ee52917d6b825b43e7d269 (diff) | |
| download | linux-next-21c04e050e5c2c694b8d643d8ec62b0704627fad.tar.gz | |
Merge branch 'remotes/lorenzo/pci/runtime-pm'
- Fix runtime power management imbalance for cadence, dra7xx, qcom, rcar
(Dinghao Liu)
* remotes/lorenzo/pci/runtime-pm:
PCI: rcar: Fix runtime PM imbalance on error
PCI: qcom: Fix runtime PM imbalance on error
PCI: cadence: Fix runtime PM imbalance on error
PCI: dwc: pci-dra7xx: Fix runtime PM imbalance on error
Diffstat (limited to 'drivers/pci/controller/cadence')
| -rw-r--r-- | drivers/pci/controller/cadence/pcie-cadence-plat.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/controller/cadence/pcie-cadence-plat.c b/drivers/pci/controller/cadence/pcie-cadence-plat.c index 6f5f07b3eed1..5fee0f89ab59 100644 --- a/drivers/pci/controller/cadence/pcie-cadence-plat.c +++ b/drivers/pci/controller/cadence/pcie-cadence-plat.c @@ -128,9 +128,8 @@ static int cdns_plat_pcie_probe(struct platform_device *pdev) } err_init: - pm_runtime_put_sync(dev); - err_get_sync: + pm_runtime_put_sync(dev); pm_runtime_disable(dev); cdns_pcie_disable_phy(cdns_plat_pcie->pcie); phy_count = cdns_plat_pcie->pcie->phy_count; |