Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / drivers / pci / host / pcie-rcar.c

diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
index 65db7a2215090ff4508141dc131fb37104b9a34b..e58bbbc0f0b5d164223f1ea1df3292891f470ca6 100644 (file)
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -775,6 +775,10 @@ static int rcar_pcie_get_resources(struct platform_device *pdev,
        if (err)
                return err;
 
+       pcie->base = devm_ioremap_resource(&pdev->dev, &res);
+       if (IS_ERR(pcie->base))
+               return PTR_ERR(pcie->base);
+
        pcie->clk = devm_clk_get(&pdev->dev, "pcie");
        if (IS_ERR(pcie->clk)) {
                dev_err(pcie->dev, "cannot get platform clock\n");
@@ -810,12 +814,6 @@ static int rcar_pcie_get_resources(struct platform_device *pdev,
        }
        pcie->msi.irq2 = i;
 
-       pcie->base = devm_ioremap_resource(&pdev->dev, &res);
-       if (IS_ERR(pcie->base)) {
-               err = PTR_ERR(pcie->base);
-               goto err_map_reg;
-       }
-
        return 0;
 
 err_map_reg: