[PATCH net-next 28/40] net: fec: unmap initial buffer on error

[Troy Kisky]

Signed-off-by: Troy Kisky <troy.ki...@boundarydevices.com>
---
 drivers/net/ethernet/freescale/fec_main.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fec_main.c 
b/drivers/net/ethernet/freescale/fec_main.c
index 7258051..e141f6f 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -404,7 +404,6 @@ dma_mapping_error:
                                bdp->cbd_datlen, DMA_TO_DEVICE);
                bdp->cbd_bufaddr = 0;
        }
-       dev_kfree_skb_any(skb);
        return ERR_PTR(-ENOMEM);
 }
 
@@ -466,8 +465,12 @@ static int fec_enet_txq_submit_skb(struct 
fec_enet_priv_tx_q *txq,
                        ((bdp == txq->bd.last) ? BD_SC_WRAP : 0);
        if (nr_frags) {
                last_bdp = fec_enet_txq_submit_frag_skb(txq, skb, ndev);
-               if (IS_ERR(last_bdp))
+               if (IS_ERR(last_bdp)) {
+                       dma_unmap_single(&fep->pdev->dev, addr,
+                                        buflen, DMA_TO_DEVICE);
+                       dev_kfree_skb_any(skb);
                        return NETDEV_TX_OK;
+               }
        } else {
                status |= (BD_ENET_TX_INTR | BD_ENET_TX_LAST);
                if (fep->bufdesc_ex) {
-- 
2.5.0