PCI: tegra: Fix pci_remap_iospace() failure path

[karo-tx-linux.git] / drivers / pci / host / pci-tegra.c

diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c
index 6de0757b11e4641b2a79b05fd62d19083656419e..8c2590db609b5b6442992d0da724804c0dd51541 100644 (file)
--- a/drivers/pci/host/pci-tegra.c
+++ b/drivers/pci/host/pci-tegra.c
@@ -621,7 +621,11 @@ static int tegra_pcie_setup(int nr, struct pci_sys_data *sys)
        if (err < 0)
                return err;
 
-       pci_add_resource_offset(&sys->resources, &pcie->pio, sys->io_offset);
+       err = pci_remap_iospace(&pcie->pio, pcie->io.start);
+       if (!err)
+               pci_add_resource_offset(&sys->resources, &pcie->pio,
+                                       sys->io_offset);
+
        pci_add_resource_offset(&sys->resources, &pcie->mem, sys->mem_offset);
        pci_add_resource_offset(&sys->resources, &pcie->prefetch,
                                sys->mem_offset);
@@ -631,7 +635,6 @@ static int tegra_pcie_setup(int nr, struct pci_sys_data *sys)
        if (err < 0)
                return err;
 
-       pci_remap_iospace(&pcie->pio, pcie->io.start);
        return 1;
 }