leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pci/host-rcar' into next

Browse Source 
* pci/host-rcar:
  PCI: rcar: Add device tree support for r8a7743/5
  PCI: rcar: Fix memory leak when no PCIe card is inserted
  PCI: rcar: Fix error exit path
This commit is contained in:
Bjorn Helgaas 2017-09-07 13:24:05 -05:00
commit 3d499a955a
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt
View File

@ -6,11 +6,14 @@ AHB. There is one bridge instance per USB port connected to the internal
OHCI and EHCI controllers. OHCI and EHCI controllers.
Required properties: Required properties:
- compatible: "renesas,pci-r8a7790" for the R8A7790 SoC; - compatible: "renesas,pci-r8a7743" for the R8A7743 SoC;
"renesas,pci-r8a7745" for the R8A7745 SoC;
"renesas,pci-r8a7790" for the R8A7790 SoC;
"renesas,pci-r8a7791" for the R8A7791 SoC; "renesas,pci-r8a7791" for the R8A7791 SoC;
"renesas,pci-r8a7793" for the R8A7793 SoC; "renesas,pci-r8a7793" for the R8A7793 SoC;
"renesas,pci-r8a7794" for the R8A7794 SoC; "renesas,pci-r8a7794" for the R8A7794 SoC;
"renesas,pci-rcar-gen2" for a generic R-Car Gen2 compatible device "renesas,pci-rcar-gen2" for a generic R-Car Gen2 or
RZ/G1 compatible device.
When compatible with the generic version, nodes must list the When compatible with the generic version, nodes must list the

12
drivers/pci/host/pcie-rcar.c
View File

@ -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) { if (ret < 0)
kfree(bridge);
return ret; return ret;
}
bus = bridge->bus; bus = bridge->bus;
@ -1190,14 +1188,16 @@ 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);
pci_free_resource_list(&pcie->resources);
return err; return err;
} }