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 branches 'at91', 'cache', 'cup', 'ep93xx', 'ixp4xx', 'nuc', 'pending-dma-stream...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
common
/
dmabounce.c
diff --git
a/arch/arm/common/dmabounce.c
b/arch/arm/common/dmabounce.c
index cc32c1e54a59825dc93fcbba098fcdbd51d9c8f0..cc0a932bbea90780f659becc4ee7d93087ab61cf 100644
(file)
--- a/
arch/arm/common/dmabounce.c
+++ b/
arch/arm/common/dmabounce.c
@@
-277,7
+277,7
@@
static inline dma_addr_t map_single(struct device *dev, void *ptr, size_t size,
* We don't need to sync the DMA buffer since
* it was allocated via the coherent allocators.
*/
* We don't need to sync the DMA buffer since
* it was allocated via the coherent allocators.
*/
-
dma_cache_maint
(ptr, size, dir);
+
__dma_single_cpu_to_dev
(ptr, size, dir);
}
return dma_addr;
}
return dma_addr;
@@
-315,6
+315,8
@@
static inline void unmap_single(struct device *dev, dma_addr_t dma_addr,
__cpuc_flush_dcache_area(ptr, size);
}
free_safe_buffer(dev->archdata.dmabounce, buf);
__cpuc_flush_dcache_area(ptr, size);
}
free_safe_buffer(dev->archdata.dmabounce, buf);
+ } else {
+ __dma_single_dev_to_cpu(dma_to_virt(dev, dma_addr), size, dir);
}
}
}
}