]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit1d18c83dbb33b6257a61c8dd54011f94c7e99e1d
tree25e4bb9e736ea3531bba24676f448d0101eff19c
parentf0466df76c2f2724141d731f7dac3d8432fc86cf
parenta7844497a55e223577ac8049ef1d0ceb102b9c2a
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