diff options
| author | Mark Brown <broonie@kernel.org> | 2019-01-29 12:04:54 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-01-29 12:04:54 +0000 |
| commit | d7c26e63cf78fef01d66ae848184c6ee5f4b8bbf (patch) | |
| tree | 3765745a38a7ae1a4a3a056dfc6c736e4c99271d /drivers/net/ethernet/intel/i40e/i40e_main.c | |
| parent | a8233b6c1972e1959cf84a021aeb61ddcd23cc26 (diff) | |
| parent | f17b5f06cb92ef2250513a1e154c47b78df07d40 (diff) | |
Merge tag 'v5.0-rc4' into asoc-5.1
Linux 5.0-rc4
Diffstat (limited to 'drivers/net/ethernet/intel/i40e/i40e_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 4d40878e395a..f52e2c46e6a7 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -109,8 +109,8 @@ int i40e_allocate_dma_mem_d(struct i40e_hw *hw, struct i40e_dma_mem *mem, struct i40e_pf *pf = (struct i40e_pf *)hw->back; mem->size = ALIGN(size, alignment); - mem->va = dma_zalloc_coherent(&pf->pdev->dev, mem->size, - &mem->pa, GFP_KERNEL); + mem->va = dma_alloc_coherent(&pf->pdev->dev, mem->size, &mem->pa, + GFP_KERNEL); if (!mem->va) return -ENOMEM; |