1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
index 13a633b1612e..8fc2a8241fa8 100644
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@ -750,9 +750,9 @@ mvebu_pcie_map_registers(struct platform_device *pdev,
 
         ret = of_address_to_resource(np, 0, &regs);
         if (ret)
-                return NULL;
+                return ERR_PTR(ret);
 
-        return devm_request_and_ioremap(&pdev->dev, &regs);
+        return devm_ioremap_resource(&pdev->dev, &regs);
 }
 
 static int __init mvebu_pcie_probe(struct platform_device *pdev)
@@ -842,9 +842,10 @@ static int __init mvebu_pcie_probe(struct platform_device *pdev)
                         continue;
 
                 port->base = mvebu_pcie_map_registers(pdev, child, port);
-                if (!port->base) {
+                if (IS_ERR(port->base)) {
                         dev_err(&pdev->dev, "PCIe%d.%d: cannot map registers\n",
                                 port->port, port->lane);
+                        port->base = NULL;
                         continue;
                 }