PCI: rockchip: Umap IO space if probe fails
authorJeffy Chen <jeffy.chen@rock-chips.com>
Wed, 23 Aug 2017 07:03:39 +0000 (15:03 +0800)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 29 Aug 2017 18:18:08 +0000 (13:18 -0500)
Call pci_unmap_iospace() to clean up if probe fails.

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
drivers/pci/host/pcie-rockchip.c

index f8763f0..56c2423 100644 (file)
@@ -1605,12 +1605,12 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
 
        err = rockchip_pcie_cfg_atu(rockchip);
        if (err)
-               goto err_free_res;
+               goto err_unmap_iospace;
 
        rockchip->msg_region = devm_ioremap(dev, rockchip->msg_bus_addr, SZ_1M);
        if (!rockchip->msg_region) {
                err = -ENOMEM;
-               goto err_free_res;
+               goto err_unmap_iospace;
        }
 
        list_splice_init(&res, &bridge->windows);
@@ -1623,7 +1623,7 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
 
        err = pci_scan_root_bus_bridge(bridge);
        if (err < 0)
-               goto err_free_res;
+               goto err_unmap_iospace;
 
        bus = bridge->bus;
 
@@ -1637,6 +1637,8 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
        pci_bus_add_devices(bus);
        return 0;
 
+err_unmap_iospace:
+       pci_unmap_iospace(rockchip->io);
 err_free_res:
        pci_free_resource_list(&res);
 err_remove_irq_domain: