diff options
| author |   Bjørn Mork <bjorn@mork.no> | 2016-01-06 13:18:01 +0100 |
|---|---|---|
| committer | Bjørn Mork <bjorn@mork.no> | 2016-01-06 13:18:01 +0100 |
| commit | f988b02dad561cef24a68180a56eecf1700cfa36 (patch) | |
| tree | 06165b980f70dd27b7f4244fbd26869afa05e28f /rx.c | |
| parent | d5f375c39db18319f61d1f4f4b2d470750eed4c3 (diff) | |
| parent | 99d3879cc72f2a25d44fb4bee96fd84eca028b04 (diff) | |
Merge remote-tracking branch 'origin/master' into bmork-current20160106bmork-current
Diffstat (limited to 'rx.c')
| -rw-r--r-- | rx.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -56,7 +56,7 @@ static int mwl_rx_ring_alloc(struct mwl_priv *priv) desc = &priv->desc_data[0]; desc->prx_ring = (struct mwl_rx_desc *) - dma_alloc_coherent(&priv->pdev->dev, + dma_alloc_coherent(priv->dev, MAX_NUM_RX_RING_BYTES, &desc->pphys_rx_ring, GFP_KERNEL); @@ -71,7 +71,7 @@ static int mwl_rx_ring_alloc(struct mwl_priv *priv) desc->rx_hndl = kmalloc(MAX_NUM_RX_HNDL_BYTES, GFP_KERNEL); if (!desc->rx_hndl) { - dma_free_coherent(&priv->pdev->dev, + dma_free_coherent(priv->dev, MAX_NUM_RX_RING_BYTES, desc->prx_ring, desc->pphys_rx_ring); @@ -191,7 +191,7 @@ static void mwl_rx_ring_free(struct mwl_priv *priv) if (desc->prx_ring) { mwl_rx_ring_cleanup(priv); - dma_free_coherent(&priv->pdev->dev, + dma_free_coherent(priv->dev, MAX_NUM_RX_RING_BYTES, desc->prx_ring, desc->pphys_rx_ring); |