aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/host/pcie-rcar.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci/host/pcie-rcar.c')
-rw-r--r--drivers/pci/host/pcie-rcar.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
index 52ab3cb0a0bf..b4c4aad2cf66 100644
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: GPL-2.0
1/* 2/*
2 * PCIe driver for Renesas R-Car SoCs 3 * PCIe driver for Renesas R-Car SoCs
3 * Copyright (C) 2014 Renesas Electronics Europe Ltd 4 * Copyright (C) 2014 Renesas Electronics Europe Ltd
@@ -8,10 +9,6 @@
8 * Copyright (C) 2009 - 2011 Paul Mundt 9 * Copyright (C) 2009 - 2011 Paul Mundt
9 * 10 *
10 * Author: Phil Edworthy <phil.edworthy@renesas.com> 11 * Author: Phil Edworthy <phil.edworthy@renesas.com>
11 *
12 * This file is licensed under the terms of the GNU General Public
13 * License version 2. This program is licensed "as is" without any
14 * warranty of any kind, whether express or implied.
15 */ 12 */
16 13
17#include <linux/clk.h> 14#include <linux/clk.h>
@@ -459,7 +456,7 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie)
459 456
460 rcar_pcie_setup(&bridge->windows, pcie); 457 rcar_pcie_setup(&bridge->windows, pcie);
461 458
462 pci_add_flags(PCI_REASSIGN_ALL_RSRC | PCI_REASSIGN_ALL_BUS); 459 pci_add_flags(PCI_REASSIGN_ALL_BUS);
463 460
464 bridge->dev.parent = dev; 461 bridge->dev.parent = dev;
465 bridge->sysdata = pcie; 462 bridge->sysdata = pcie;
@@ -1123,7 +1120,9 @@ static int rcar_pcie_probe(struct platform_device *pdev)
1123 1120
1124 INIT_LIST_HEAD(&pcie->resources); 1121 INIT_LIST_HEAD(&pcie->resources);
1125 1122
1126 rcar_pcie_parse_request_of_pci_ranges(pcie); 1123 err = rcar_pcie_parse_request_of_pci_ranges(pcie);
1124 if (err)
1125 goto err_free_bridge;
1127 1126
1128 err = rcar_pcie_get_resources(pcie); 1127 err = rcar_pcie_get_resources(pcie);
1129 if (err < 0) { 1128 if (err < 0) {
@@ -1178,6 +1177,7 @@ err_pm_disable:
1178 1177
1179err_free_resource_list: 1178err_free_resource_list:
1180 pci_free_resource_list(&pcie->resources); 1179 pci_free_resource_list(&pcie->resources);
1180err_free_bridge:
1181 pci_free_host_bridge(bridge); 1181 pci_free_host_bridge(bridge);
1182 1182
1183 return err; 1183 return err;