Commit 531a953d authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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()
parents c57400bb b5d9209d

drivers/pci/controller/pcie-brcmstb.c

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

	}