Merge branch 'pci/host/cadence'
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 5 Nov 2021 16:28:49 +0000 (11:28 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 5 Nov 2021 16:28:49 +0000 (11:28 -0500)
commit93a6bba088c72d5829a22208f1f1544264e81599
tree25e4bb9e736ea3531bba24676f448d0101eff19c
parent6b0567dae2e7b4bb3034f07e02e49ab67d713c2b
parent27cd7e3c9bb1ae13bc16f08138edd6e4df3cd211
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