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 /tx.c | |
| parent | d5f375c39db18319f61d1f4f4b2d470750eed4c3 (diff) | |
| parent | 99d3879cc72f2a25d44fb4bee96fd84eca028b04 (diff) | |
Merge remote-tracking branch 'origin/master' into bmork-current20160106bmork-current
Diffstat (limited to 'tx.c')
| -rw-r--r-- | tx.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -76,7 +76,7 @@ static int mwl_tx_ring_alloc(struct mwl_priv *priv) desc = &priv->desc_data[0]; - mem = dma_alloc_coherent(&priv->pdev->dev, + mem = dma_alloc_coherent(priv->dev, MAX_NUM_TX_RING_BYTES * SYSADPT_NUM_OF_DESC_DATA, &desc->pphys_tx_ring, @@ -106,7 +106,7 @@ static int mwl_tx_ring_alloc(struct mwl_priv *priv) if (!mem) { wiphy_err(priv->hw->wiphy, "cannot alloc mem\n"); - dma_free_coherent(&priv->pdev->dev, + dma_free_coherent(priv->dev, MAX_NUM_TX_RING_BYTES * SYSADPT_NUM_OF_DESC_DATA, priv->desc_data[0].ptx_ring, @@ -214,7 +214,7 @@ static void mwl_tx_ring_free(struct mwl_priv *priv) int num; if (priv->desc_data[0].ptx_ring) { - dma_free_coherent(&priv->pdev->dev, + dma_free_coherent(priv->dev, MAX_NUM_TX_RING_BYTES * SYSADPT_NUM_OF_DESC_DATA, priv->desc_data[0].ptx_ring, |