lkml.org 
[lkml]   [2020]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 067/179] net: bcmgenet: fix error returns in bcmgenet_probe()
    Date
    From: Zhang Changzhong <zhangchangzhong@huawei.com>

    [ Upstream commit 24a63fe6d45d6527db5ab87bcd1da6921f10e89e ]

    The driver forgets to call clk_disable_unprepare() in error path after
    a success calling for clk_prepare_enable().

    Fix to goto err_clk_disable if clk_prepare_enable() is successful.

    Fixes: 99d55638d4b0 ("net: bcmgenet: enable NETIF_F_HIGHDMA flag")
    Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
    Acked-by: Doug Berger <opendmb@gmail.com>
    Acked-by: Florian fainelli <f.fainelli@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
    index dde1c23c8e399..7b95bb77ad3bb 100644
    --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
    +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
    @@ -3522,7 +3522,7 @@ static int bcmgenet_probe(struct platform_device *pdev)
    if (err)
    err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
    if (err)
    - goto err;
    + goto err_clk_disable;

    /* Mii wait queue */
    init_waitqueue_head(&priv->wq);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-07-27 16:30    [W:2.428 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site