diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2021-11-05 19:28:49 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-11-05 19:28:49 +0300 |
| commit | 93a6bba088c72d5829a22208f1f1544264e81599 (patch) | |
| tree | 25e4bb9e736ea3531bba24676f448d0101eff19c /drivers/pci/controller | |
| parent | 6b0567dae2e7b4bb3034f07e02e49ab67d713c2b (diff) | |
| parent | 27cd7e3c9bb1ae13bc16f08138edd6e4df3cd211 (diff) | |
| download | linux-93a6bba088c72d5829a22208f1f1544264e81599.tar.xz | |
Merge branch 'pci/host/cadence'
- Disable PHY when j721e_pcie_probe() fails after initializing it
(Christophe JAILLET)
- Return success when cdns-pcie probe succeeds instead of doing error
cleanup (Li Chen)
* pci/host/cadence:
PCI: cadence: Add cdns_plat_pcie_probe() missing return
PCI: j721e: Fix j721e_pcie_probe() error path
Diffstat (limited to 'drivers/pci/controller')
| -rw-r--r-- | drivers/pci/controller/cadence/pci-j721e.c | 2 | ||||
| -rw-r--r-- | drivers/pci/controller/cadence/pcie-cadence-plat.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/controller/cadence/pci-j721e.c b/drivers/pci/controller/cadence/pci-j721e.c index ffb176d288cd..918e11082e6a 100644 --- a/drivers/pci/controller/cadence/pci-j721e.c +++ b/drivers/pci/controller/cadence/pci-j721e.c @@ -474,7 +474,7 @@ static int j721e_pcie_probe(struct platform_device *pdev) ret = clk_prepare_enable(clk); if (ret) { dev_err(dev, "failed to enable pcie_refclk\n"); - goto err_get_sync; + goto err_pcie_setup; } pcie->refclk = clk; diff --git a/drivers/pci/controller/cadence/pcie-cadence-plat.c b/drivers/pci/controller/cadence/pcie-cadence-plat.c index 5fee0f89ab59..a224afadbcc0 100644 --- a/drivers/pci/controller/cadence/pcie-cadence-plat.c +++ b/drivers/pci/controller/cadence/pcie-cadence-plat.c @@ -127,6 +127,8 @@ static int cdns_plat_pcie_probe(struct platform_device *pdev) goto err_init; } + return 0; + err_init: err_get_sync: pm_runtime_put_sync(dev); |