PCI: mvebu: increment nports only for registered ports
authorSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tue, 13 Aug 2013 12:25:21 +0000 (14:25 +0200)
committerJason Cooper <jason@lakedaemon.net>
Mon, 30 Sep 2013 14:58:35 +0000 (14:58 +0000)
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>
drivers/pci/host/pci-mvebu.c

index 5c327ce846dcfd82151585bebcb009bf23d47649..87aaed591c802290a09a70972cc0234f7728231b 100644 (file)
@@ -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;