|
@@ -471,10 +471,8 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie)
|
|
bridge->msi = &pcie->msi.chip;
|
|
bridge->msi = &pcie->msi.chip;
|
|
|
|
|
|
ret = pci_scan_root_bus_bridge(bridge);
|
|
ret = pci_scan_root_bus_bridge(bridge);
|
|
- if (ret < 0) {
|
|
|
|
- kfree(bridge);
|
|
|
|
|
|
+ if (ret < 0)
|
|
return ret;
|
|
return ret;
|
|
- }
|
|
|
|
|
|
|
|
bus = bridge->bus;
|
|
bus = bridge->bus;
|
|
|
|
|
|
@@ -1190,14 +1188,15 @@ static int rcar_pcie_probe(struct platform_device *pdev)
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
-err_free_bridge:
|
|
|
|
- pci_free_host_bridge(bridge);
|
|
|
|
-
|
|
|
|
err_pm_put:
|
|
err_pm_put:
|
|
pm_runtime_put(dev);
|
|
pm_runtime_put(dev);
|
|
|
|
|
|
err_pm_disable:
|
|
err_pm_disable:
|
|
pm_runtime_disable(dev);
|
|
pm_runtime_disable(dev);
|
|
|
|
+
|
|
|
|
+err_free_bridge:
|
|
|
|
+ pci_free_host_bridge(bridge);
|
|
|
|
+
|
|
return err;
|
|
return err;
|
|
}
|
|
}
|
|
|
|
|