lkml.org 
[lkml]   [2019]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 048/183] net: mv643xx_eth: disable clk on error path in mv643xx_eth_shared_probe()
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit e928b5d6b75e239feb9c6d5488974b6646a0ebc8 ]

    If mv643xx_eth_shared_of_probe() fails, mv643xx_eth_shared_probe()
    leaves clk enabled.

    Found by Linux Driver Verification project (linuxtesting.org).

    Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/marvell/mv643xx_eth.c | 7 ++++++-
    1 file changed, 6 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
    index 81c1fac00d33..2434409f84b2 100644
    --- a/drivers/net/ethernet/marvell/mv643xx_eth.c
    +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
    @@ -2886,7 +2886,7 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)

    ret = mv643xx_eth_shared_of_probe(pdev);
    if (ret)
    - return ret;
    + goto err_put_clk;
    pd = dev_get_platdata(&pdev->dev);

    msp->tx_csum_limit = (pd != NULL && pd->tx_csum_limit) ?
    @@ -2894,6 +2894,11 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
    infer_hw_params(msp);

    return 0;
    +
    +err_put_clk:
    + if (!IS_ERR(msp->clk))
    + clk_disable_unprepare(msp->clk);
    + return ret;
    }

    static int mv643xx_eth_shared_remove(struct platform_device *pdev)
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-03-22 13:58    [W:4.150 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site