lkml.org 
[lkml]   [2021]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 02/20] net: stmmac: Free Rx descs on Tx allocation failure
    Date
    Indeed in accordance with the alloc_dma_desc_resources() method logic the
    Rx descriptors will be left allocated if Tx descriptors allocation fails.
    Fix it by calling the free_dma_rx_desc_resources() in case if the
    alloc_dma_tx_desc_resources() method returns non-zero value.

    While at it refactor the method a bit. Just move the Rx descriptors
    allocation method invocation out of the local variables declaration block
    and discard a pointless comment from there.

    Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
    ---
    drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
    index 03acf14d76de..5ee840525824 100644
    --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
    +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
    @@ -1791,13 +1791,15 @@ static int alloc_dma_tx_desc_resources(struct stmmac_priv *priv)
    */
    static int alloc_dma_desc_resources(struct stmmac_priv *priv)
    {
    - /* RX Allocation */
    - int ret = alloc_dma_rx_desc_resources(priv);
    + int ret;

    + ret = alloc_dma_rx_desc_resources(priv);
    if (ret)
    return ret;

    ret = alloc_dma_tx_desc_resources(priv);
    + if (ret)
    + free_dma_rx_desc_resources(priv);

    return ret;
    }
    --
    2.29.2
    \
     
     \ /
      Last update: 2021-02-08 15:25    [W:2.254 / U:0.776 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site