diff options
| author |   Denis Kirjanov <dkirjanov@hera.kernel.org> | 2010-07-08 10:24:51 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-07-08 23:39:49 -0700 |
| commit | 301e9d96bf65292f916a3936d63c504ac7792ee6 (patch) | |
| tree | d8262d45ab7bbd348f7993cad9f7704574c008f8 /drivers/net/ll_temac_main.c | |
| parent | sfc: Remove unused field left from mis-merge (diff) | |
| download | linux-dev-301e9d96bf65292f916a3936d63c504ac7792ee6.tar.xz linux-dev-301e9d96bf65292f916a3936d63c504ac7792ee6.zip | |
ll_temac: fix DMA resources leak
V2: Check pointers before releasing resources.
Fix DMA resources leak.
Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ll_temac_main.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c index fa303c881a48..b57d0ff52519 100644 --- a/drivers/net/ll_temac_main.c +++ b/drivers/net/ll_temac_main.c @@ -193,6 +193,35 @@ static int temac_dcr_setup(struct temac_local *lp, struct of_device *op, #endif /** + * * temac_dma_bd_release - Release buffer descriptor rings + */ +static void temac_dma_bd_release(struct net_device *ndev) +{ + struct temac_local *lp = netdev_priv(ndev); + int i; + + for (i = 0; i < RX_BD_NUM; i++) { + if (!lp->rx_skb[i]) + break; + else { + dma_unmap_single(ndev->dev.parent, lp->rx_bd_v[i].phys, + XTE_MAX_JUMBO_FRAME_SIZE, DMA_FROM_DEVICE); + dev_kfree_skb(lp->rx_skb[i]); + } + } + if (lp->rx_bd_v) + dma_free_coherent(ndev->dev.parent, + sizeof(*lp->rx_bd_v) * RX_BD_NUM, + lp->rx_bd_v, lp->rx_bd_p); + if (lp->tx_bd_v) + dma_free_coherent(ndev->dev.parent, + sizeof(*lp->tx_bd_v) * TX_BD_NUM, + lp->tx_bd_v, lp->tx_bd_p); + if (lp->rx_skb) + kfree(lp->rx_skb); +} + +/** * temac_dma_bd_init - Setup buffer descriptor rings */ static int temac_dma_bd_init(struct net_device *ndev) @@ -275,6 +304,7 @@ static int temac_dma_bd_init(struct net_device *ndev) return 0; out: + temac_dma_bd_release(ndev); return -ENOMEM; } @@ -858,6 +888,8 @@ static int temac_stop(struct net_device *ndev) phy_disconnect(lp->phy_dev); lp->phy_dev = NULL; + temac_dma_bd_release(ndev); + return 0; } |