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 branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[sfrench/cifs-2.6.git]
/
drivers
/
scsi
/
NCR_Q720.c
diff --git
a/drivers/scsi/NCR_Q720.c
b/drivers/scsi/NCR_Q720.c
index 05835bf1bf9cf271bdb1190a411b1d3378f08e80..54e7d26908ee482a4dfd4077e379f18dede4d562 100644
(file)
--- a/
drivers/scsi/NCR_Q720.c
+++ b/
drivers/scsi/NCR_Q720.c
@@
-217,8
+217,7
@@
NCR_Q720_probe(struct device *dev)
}
if (dma_declare_coherent_memory(dev, base_addr, base_addr,
- mem_size, DMA_MEMORY_MAP)
- != DMA_MEMORY_MAP) {
+ mem_size, 0)) {
printk(KERN_ERR "NCR_Q720: DMA declare memory failed\n");
goto out_release_region;
}