Commit 93a6bba0 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents 6b0567da 27cd7e3c

drivers/pci/controller/cadence/pci-j721e.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/pci/controller/cadence/pcie-cadence-plat.c

+2 −0
Original line number Diff line number Diff line
@@ -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);