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
swiotlb: Skip cache maintenance on map error
[sfrench/cifs-2.6.git]
/
kernel
/
dma
/
swiotlb.c
diff --git
a/kernel/dma/swiotlb.c
b/kernel/dma/swiotlb.c
index 5731daa09a32edc2175657384aee68b60a365a2a..045930e32c0e93d91fab9b28a4329f5b2dc1c356 100644
(file)
--- a/
kernel/dma/swiotlb.c
+++ b/
kernel/dma/swiotlb.c
@@
-679,7
+679,8
@@
dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
}
if (!dev_is_dma_coherent(dev) &&
- (attrs & DMA_ATTR_SKIP_CPU_SYNC) == 0)
+ (attrs & DMA_ATTR_SKIP_CPU_SYNC) == 0 &&
+ dev_addr != DIRECT_MAPPING_ERROR)
arch_sync_dma_for_device(dev, phys, size, dir);
return dev_addr;