lkml.org 
[lkml]   [2020]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 039/265] net: macb: undo operations in case of failure
    Date
    From: Claudiu Beznea <claudiu.beznea@microchip.com>

    [ Upstream commit faa620876b01d6744f1599e279042bb8149247ab ]

    Undo previously done operation in case macb_phylink_connect()
    fails. Since macb_reset_hw() is the 1st undo operation the
    napi_exit label was renamed to reset_hw.

    Fixes: 7897b071ac3b ("net: macb: convert to phylink")
    Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
    Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/cadence/macb_main.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
    index 67933079aeea5..257c4920cb886 100644
    --- a/drivers/net/ethernet/cadence/macb_main.c
    +++ b/drivers/net/ethernet/cadence/macb_main.c
    @@ -2558,7 +2558,7 @@ static int macb_open(struct net_device *dev)

    err = macb_phylink_connect(bp);
    if (err)
    - goto napi_exit;
    + goto reset_hw;

    netif_tx_start_all_queues(dev);

    @@ -2567,9 +2567,11 @@ static int macb_open(struct net_device *dev)

    return 0;

    -napi_exit:
    +reset_hw:
    + macb_reset_hw(bp);
    for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue)
    napi_disable(&queue->napi);
    + macb_free_consistent(bp);
    pm_exit:
    pm_runtime_put_sync(&bp->pdev->dev);
    return err;
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-29 23:36    [W:4.070 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site