diff options
| author | Lorenzo Pieralisi | 2017-08-04 05:32:54 +0200 |
|---|---|---|
| committer | Bjorn Helgaas | 2017-08-16 00:51:19 +0200 |
| commit | 3c60e01a12461c89db2349b95c77c9eb36fdd439 (patch) | |
| tree | 065c50827b2ae7ecabf8775ae5533296ec15d8b4 /drivers/pci | |
| parent | Linux 4.13-rc3 (diff) | |
| download | kernel-qcow2-linux-3c60e01a12461c89db2349b95c77c9eb36fdd439.tar.gz kernel-qcow2-linux-3c60e01a12461c89db2349b95c77c9eb36fdd439.tar.xz kernel-qcow2-linux-3c60e01a12461c89db2349b95c77c9eb36fdd439.zip | |
PCI: rcar: Fix error exit path
Commit 90634e854079 ("PCI: rcar: Convert PCI scan API to
pci_scan_root_bus_bridge()") converted PCI root bus scan API to the new
pci_scan_root_bus_bridge() API; in the process some error paths were not
updated correctly which may cause memory leaks.
Fix the driver error exit path reinstating the previous correct
error exit behaviour.
Fixes: 90634e854079 ("PCI: rcar: Convert PCI scan API to pci_scan_root_bus_bridge()")
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/host/pcie-rcar.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index 246d485b24c6..007523e85c66 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -471,10 +471,8 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie) bridge->msi = &pcie->msi.chip; ret = pci_scan_root_bus_bridge(bridge); - if (ret < 0) { - kfree(bridge); + if (ret < 0) return ret; - } bus = bridge->bus; @@ -1190,14 +1188,15 @@ static int rcar_pcie_probe(struct platform_device *pdev) return 0; -err_free_bridge: - pci_free_host_bridge(bridge); - err_pm_put: pm_runtime_put(dev); err_pm_disable: pm_runtime_disable(dev); + +err_free_bridge: + pci_free_host_bridge(bridge); + return err; } |