summaryrefslogtreecommitdiff
path: root/drivers/pci/host/pcie-iproc-bcma.c
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-05-24 22:37:02 +0200
committerBjorn Helgaas <bhelgaas@google.com>2015-05-27 18:27:54 -0500
commit18c4342aa56d70176eea85021e6fe8f6f8f39c7b (patch)
treebbd138c03d8ca533fee4362b0325eb79340a92da /drivers/pci/host/pcie-iproc-bcma.c
parent4785ffbdc9b52e308e43b9e2dcc1dca44f056d76 (diff)
PCI: iproc: Directly add PCI resources
The struct iproc_pcie.resources member was pointing to a stack variable and is invalid after the registration function returned. Remove this pointer and add a parameter to the function. Tested-by: Ray Jui <rjui@broadcom.com> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Ray Jui <rjui@broadcom.com>
Diffstat (limited to 'drivers/pci/host/pcie-iproc-bcma.c')
-rw-r--r--drivers/pci/host/pcie-iproc-bcma.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pci/host/pcie-iproc-bcma.c b/drivers/pci/host/pcie-iproc-bcma.c
index 32119af0fe6a..7a412a145b51 100644
--- a/drivers/pci/host/pcie-iproc-bcma.c
+++ b/drivers/pci/host/pcie-iproc-bcma.c
@@ -62,11 +62,9 @@ static int iproc_pcie_bcma_probe(struct bcma_device *bdev)
res_mem.flags = IORESOURCE_MEM;
pci_add_resource(&res, &res_mem);
- pcie->resources = &res;
-
pcie->map_irq = iproc_pcie_bcma_map_irq;
- ret = iproc_pcie_setup(pcie);
+ ret = iproc_pcie_setup(pcie, &res);
if (ret) {
dev_err(pcie->dev, "PCIe controller setup failed\n");
return ret;