Merge tag 'for-hubcap-v4.9-readahead' of git://github.com/martinbrandenburg/linux

[cascardo/linux.git] / drivers / pci / host / pcie-xilinx-nwl.c

diff --git a/drivers/pci/host/pcie-xilinx-nwl.c b/drivers/pci/host/pcie-xilinx-nwl.c
index 3479d30..0b597d9 100644 (file)
--- a/drivers/pci/host/pcie-xilinx-nwl.c
+++ b/drivers/pci/host/pcie-xilinx-nwl.c
@@ -825,27 +825,33 @@ static int nwl_pcie_probe(struct platform_device *pdev)
 
        err = of_pci_get_host_bridge_resources(node, 0, 0xff, &res, &iobase);
        if (err) {
-               pr_err("Getting bridge resources failed\n");
+               dev_err(pcie->dev, "Getting bridge resources failed\n");
                return err;
        }
 
+       err = devm_request_pci_bus_resources(pcie->dev, &res);
+       if (err)
+               goto error;
+
        err = nwl_pcie_init_irq_domain(pcie);
        if (err) {
                dev_err(pcie->dev, "Failed creating IRQ Domain\n");
-               return err;
+               goto error;
        }
 
        bus = pci_create_root_bus(&pdev->dev, pcie->root_busno,
                                  &nwl_pcie_ops, pcie, &res);
-       if (!bus)
-               return -ENOMEM;
+       if (!bus) {
+               err = -ENOMEM;
+               goto error;
+       }
 
        if (IS_ENABLED(CONFIG_PCI_MSI)) {
                err = nwl_pcie_enable_msi(pcie, bus);
                if (err < 0) {
                        dev_err(&pdev->dev,
                                "failed to enable MSI support: %d\n", err);
-                       return err;
+                       goto error;
                }
        }
        pci_scan_child_bus(bus);
@@ -855,6 +861,10 @@ static int nwl_pcie_probe(struct platform_device *pdev)
        pci_bus_add_devices(bus);
        platform_set_drvdata(pdev, pcie);
        return 0;
+
+error:
+       pci_free_resource_list(&res);
+       return err;
 }
 
 static int nwl_pcie_remove(struct platform_device *pdev)