From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 5 Nov 2021 16:28:49 +0000 (-0500)
Subject: Merge branch 'pci/host/cadence'
X-Git-Tag: block-5.16-2021-11-13~42^2~10
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=93a6bba088c72d5829a22208f1f1544264e81599;p=linux-block.git

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
---

93a6bba088c72d5829a22208f1f1544264e81599