Commit 98072e31 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/apple' 

- Initialize pcie->nvecs (number of available MSIs) before use (Sven Peter)

* pci/controller/apple:
  PCI: apple: Initialize pcie->nvecs before use
parents 3c298b84 d8650c0c

drivers/pci/controller/pcie-apple.c

+5 −1
Original line number Diff line number Diff line
@@ -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)