diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2021-05-04 10:43:25 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-05-04 10:43:25 -0500 |
| commit | 531a953da3fa80d30880c602a3525061204a6e29 (patch) | |
| tree | 56ddad091c3805e2082412a311456814ee1d0689 /drivers/pci | |
| parent | Merge branch 'remotes/lorenzo/pci/altera-msi' (diff) | |
| parent | PCI: brcmstb: Fix error return code in brcm_pcie_probe() (diff) | |
| download | linux-dev-531a953da3fa80d30880c602a3525061204a6e29.tar.xz linux-dev-531a953da3fa80d30880c602a3525061204a6e29.zip | |
Merge branch 'remotes/lorenzo/pci/brcmstb'
- Fix brcm_pcie_probe() error return for unsupported revision (Wei Yongjun)
* remotes/lorenzo/pci/brcmstb:
PCI: brcmstb: Fix error return code in brcm_pcie_probe()
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/controller/pcie-brcmstb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index e330e6811f0b..69c999222cc8 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -1296,6 +1296,7 @@ static int brcm_pcie_probe(struct platform_device *pdev) pcie->hw_rev = readl(pcie->base + PCIE_MISC_REVISION); if (pcie->type == BCM4908 && pcie->hw_rev >= BRCM_PCIE_HW_REV_3_20) { dev_err(pcie->dev, "hardware revision with unsupported PERST# setup\n"); + ret = -ENODEV; goto fail; } |