projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'clk-ingenic', 'clk-mtk-mux', 'clk-qcom-sdm845-pcie', 'clk-mtk-crit...
[linux-2.6-microblaze.git]
/
drivers
/
net
/
ethernet
/
broadcom
/
bnxt
/
bnxt_devlink.c
diff --git
a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
index
140dbd6
..
7f56032
100644
(file)
--- a/
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
+++ b/
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
@@
-85,8
+85,8
@@
static int bnxt_hwrm_nvm_req(struct bnxt *bp, u32 param_id, void *msg,
return -EFAULT;
}
- data_addr = dma_
z
alloc_coherent(&bp->pdev->dev, bytesize,
-
&data_dma_addr, GFP_KERNEL);
+ data_addr = dma_alloc_coherent(&bp->pdev->dev, bytesize,
+ &data_dma_addr, GFP_KERNEL);
if (!data_addr)
return -ENOMEM;