Commit bf09b6ae authored Aug 13, 2013 by Sebastian Hesselbarth Committed by Jason Cooper Sep 30, 2013

PCI: mvebu: increment nports only for registered ports

The number of ports is probed by counting the number of available child nodes.
Later on, the registration of a port can fail and cause a mismatch between
the ->nports counter and registered ports. This patch modifies the counting
strategy, to make ->nports represent the number of registered ports instead
of the number of available childs.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

parent b42285f6

drivers/pci/host/pci-mvebu.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -842,13 +842,14 @@ static int __init mvebu_pcie_probe(struct platform_device *pdev)
		return ret;
		}

		i = 0;
		for_each_child_of_node(pdev->dev.of_node, child) {
		if (!of_device_is_available(child))
		continue;
		pcie->nports++;
		i++;
		}

		pcie->ports = devm_kzalloc(&pdev->dev, pcie->nports *
		pcie->ports = devm_kzalloc(&pdev->dev, i *
		sizeof(struct mvebu_pcie_port),
		GFP_KERNEL);
		if (!pcie->ports)
		@@ -935,8 +936,8 @@ static int __init mvebu_pcie_probe(struct platform_device *pdev)
		i++;
		}

		pcie->nports = i;
		mvebu_pcie_msi_enable(pcie);

		mvebu_pcie_enable(pcie);

		return 0;