UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: bcmgenet: prevent duplicate calls of bcmgenet_dma_teardown 

When bcmgenet_dma_teardown is called from bcmgenet_fini_dma it ends
up getting called twice from the bcmgenet_close and bcmgenet_suspend
functions (once directly and once inside the bcmgenet_fini_dma call).

This commit removes the call from bcmgenet_fini_dma and ensures that
bcmgenet_dma_teardown is called before bcmgenet_fini_dma in all paths
of execution.

Fixes: 4a0c081eff ("net: bcmgenet: call bcmgenet_dma_teardown in bcmgenet_fini_dma")
Signed-off-by: Doug Berger <opendmb@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Doug Berger 2017-10-25 15:04:12 -07:00 committed by David S. Miller
parent 0d314502bb
commit 4fd6dc98c1
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/broadcom/genet/bcmgenet.c
View File

@ -2505,9 +2505,6 @@ static void bcmgenet_fini_dma(struct bcmgenet_priv *priv)
bcmgenet_fini_rx_napi(priv); bcmgenet_fini_rx_napi(priv);
bcmgenet_fini_tx_napi(priv); bcmgenet_fini_tx_napi(priv);
/* disable DMA */
bcmgenet_dma_teardown(priv);
for (i = 0; i < priv->num_tx_bds; i++) { for (i = 0; i < priv->num_tx_bds; i++) {
cb = priv->tx_cbs + i; cb = priv->tx_cbs + i;
skb = bcmgenet_free_tx_cb(&priv->pdev->dev, cb); skb = bcmgenet_free_tx_cb(&priv->pdev->dev, cb);
@ -2930,6 +2927,7 @@ err_irq1:
err_irq0: err_irq0:
free_irq(priv->irq0, priv); free_irq(priv->irq0, priv);
err_fini_dma: err_fini_dma:
bcmgenet_dma_teardown(priv);
bcmgenet_fini_dma(priv); bcmgenet_fini_dma(priv);
err_clk_disable: err_clk_disable:
if (priv->internal_phy) if (priv->internal_phy)