lkml.org 
[lkml]   [2017]   [Aug]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 1/2] PCI: rcar: Fix error exit path
    Date
    From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

    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>
    ---
    drivers/pci/host/pcie-rcar.c | 11 +++++------
    1 file changed, 5 insertions(+), 6 deletions(-)

    diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
    index ac80fbb..6b73981 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;
    }

    --
    2.9.2
    \
     
     \ /
      Last update: 2017-08-04 05:34    [W:4.612 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site