git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'sound-5.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[sfrench/cifs-2.6.git]
/
drivers
/
soc
/
fsl
/
qbman
/
dpaa_sys.c
diff --git
a/drivers/soc/fsl/qbman/dpaa_sys.c
b/drivers/soc/fsl/qbman/dpaa_sys.c
index 9436aa83ff1bc722ec097e2d170daf11bdad1ba0..e6d48dccb8d5de2098625ac92dacf8626c981729 100644
(file)
--- a/
drivers/soc/fsl/qbman/dpaa_sys.c
+++ b/
drivers/soc/fsl/qbman/dpaa_sys.c
@@
-62,7
+62,7
@@
int qbman_init_private_mem(struct device *dev, int idx, dma_addr_t *addr,
return -ENODEV;
}
- if (!dma_
z
alloc_coherent(dev, *size, addr, 0)) {
+ if (!dma_alloc_coherent(dev, *size, addr, 0)) {
dev_err(dev, "DMA Alloc memory failed\n");
return -ENODEV;
}