Merge branch 'pci/controller/apple'

bjorn-helgaas · bjorn-helgaas · commit 98072e31aeee · 2023-08-29T11:03:51.000-05:00
- Initialize pcie-&gt;nvecs (number of available MSIs) before use (Sven Peter)

* pci/controller/apple:
  PCI: apple: Initialize pcie-&gt;nvecs before use
diff --git a/drivers/pci/controller/pcie-apple.c b/drivers/pci/controller/pcie-apple.c
@@ -783,6 +783,10 @@ static int apple_pcie_init(struct pci_config_window *cfg)
 	cfg->priv = pcie;
 	INIT_LIST_HEAD(&pcie->ports);
 
+	ret = apple_msi_init(pcie);
+	if (ret)
+		return ret;
+
 	for_each_child_of_node(dev->of_node, of_port) {
 		ret = apple_pcie_setup_port(pcie, of_port);
 		if (ret) {
@@ -792,7 +796,7 @@ static int apple_pcie_init(struct pci_config_window *cfg)
 		}
 	}
 
-	return apple_msi_init(pcie);
+	return 0;
 }
 
 static int apple_pcie_probe(struct platform_device *pdev)

Original file line number	Diff line number	Diff line change
`@@ -783,6 +783,10 @@ static int apple_pcie_init(struct pci_config_window *cfg)`
`783`	`783`	`cfg->priv = pcie;`
`784`	`784`	`INIT_LIST_HEAD(&pcie->ports);`
`785`	`785`
	`786`	`+ ret = apple_msi_init(pcie);`
	`787`	`+ if (ret)`
	`788`	`+ return ret;`
	`789`	`+`
`786`	`790`	`for_each_child_of_node(dev->of_node, of_port) {`
`787`	`791`	`ret = apple_pcie_setup_port(pcie, of_port);`
`788`	`792`	`if (ret) {`
`@@ -792,7 +796,7 @@ static int apple_pcie_init(struct pci_config_window *cfg)`
`792`	`796`	`}`
`793`	`797`	`}`
`794`	`798`
`795`		`- return apple_msi_init(pcie);`
	`799`	`+ return 0;`
`796`	`800`	`}`
`797`	`801`
`798`	`802`	`static int apple_pcie_probe(struct platform_device *pdev)`