diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-07-18 07:36:16 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-07-18 07:36:16 -0700 |
| commit | caf64f630e602e0269016a9f302b5de9e61a357e (patch) | |
| tree | 8f5987c1512990994c7a0fb9a75f53fb901a6b26 /drivers | |
| parent | 4e1c387ba60d2fc32e9035807d238d3d37070ce6 (diff) | |
| parent | 15e301a5f0f7aa8aa93bd9b336ea4595f322e8b4 (diff) | |
Merge branch 'upstream-pulls' of github.com:kelvinlawson/linux-imx6 into kelvinlawson-upstream-pulls
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/fec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 97b2f84ffd71..acdb0b0f0cc4 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -642,7 +642,7 @@ static int fec_rx_poll(struct napi_struct *napi, int budget) data = (__u8 *)__va(bdp->cbd_bufaddr); if (bdp->cbd_bufaddr) - dma_unmap_single(&ndev->dev, bdp->cbd_bufaddr, + dma_unmap_single(&fep->pdev->dev, bdp->cbd_bufaddr, FEC_ENET_RX_FRSIZE, DMA_FROM_DEVICE); if (id_entry->driver_data & FEC_QUIRK_SWAP_FRAME) @@ -670,7 +670,7 @@ static int fec_rx_poll(struct napi_struct *napi, int budget) netif_receive_skb(skb); } - bdp->cbd_bufaddr = dma_map_single(&ndev->dev, data, + bdp->cbd_bufaddr = dma_map_single(&fep->pdev->dev, data, FEC_ENET_RX_FRSIZE, DMA_FROM_DEVICE); rx_processing_done: /* Clear the status flags for this buffer */ |