PCI: aardvark: Check for errors from pci_bridge_emul_init() call (7862a613) · Commits · 戴 / test

drivers/pci/controller/pci-aardvark.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -607,7 +607,7 @@ static struct pci_bridge_emul_ops advk_pci_bridge_emul_ops = {
		* Initialize the configuration space of the PCI-to-PCI bridge
		* associated with the given PCIe interface.
		*/
		static void advk_sw_pci_bridge_init(struct advk_pcie *pcie)
		static int advk_sw_pci_bridge_init(struct advk_pcie *pcie)
		{
		struct pci_bridge_emul *bridge = &pcie->bridge;

		@@ -633,8 +633,7 @@ static void advk_sw_pci_bridge_init(struct advk_pcie *pcie)
		bridge->data = pcie;
		bridge->ops = &advk_pci_bridge_emul_ops;

		pci_bridge_emul_init(bridge, 0);

		return pci_bridge_emul_init(bridge, 0);
		}

		static bool advk_pcie_valid_device(struct advk_pcie pcie, struct pci_bus bus,
		@@ -1167,7 +1166,11 @@ static int advk_pcie_probe(struct platform_device *pdev)

		advk_pcie_setup_hw(pcie);

		advk_sw_pci_bridge_init(pcie);
		ret = advk_sw_pci_bridge_init(pcie);
		if (ret) {
		dev_err(dev, "Failed to register emulated root PCI bridge\n");
		return ret;
		}

		ret = advk_pcie_init_irq_domain(pcie);
		if (ret) {