hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Sebastian Hesselbarth 2013-08-13 14:25:21 +02:00 committed by Jason Cooper
parent b42285f66f
commit bf09b6ae58
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/pci/host/pci-mvebu.c
View File

@ -842,13 +842,14 @@ static int __init mvebu_pcie_probe(struct platform_device *pdev)
return ret; return ret;
} }
i = 0;
for_each_child_of_node(pdev->dev.of_node, child) { for_each_child_of_node(pdev->dev.of_node, child) {
if (!of_device_is_available(child)) if (!of_device_is_available(child))
continue; continue;
pcie->nports++; i++;
} }
pcie->ports = devm_kzalloc(&pdev->dev, pcie->nports * pcie->ports = devm_kzalloc(&pdev->dev, i *
sizeof(struct mvebu_pcie_port), sizeof(struct mvebu_pcie_port),
GFP_KERNEL); GFP_KERNEL);
if (!pcie->ports) if (!pcie->ports)
@ -935,8 +936,8 @@ static int __init mvebu_pcie_probe(struct platform_device *pdev)
i++; i++;
} }
pcie->nports = i;
mvebu_pcie_msi_enable(pcie); mvebu_pcie_msi_enable(pcie);
mvebu_pcie_enable(pcie); mvebu_pcie_enable(pcie);
return 0; return 0;