[PATCH 02/20] net: stmmac: Free Rx descs on Tx allocation failure

Serge Semin Sergey.Semin at baikalelectronics.ru
Mon Feb 8 09:03:23 EST 2021

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 at 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;

More information about the linux-arm-kernel mailing list