mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-03 21:09:42 +02:00
linux/ixp4xx: fix an embracing mistake on commit r23150 (thank you KanjiMonster)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23153 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
71f447678d
commit
7ed7ed4ffa
@ -129,7 +129,7 @@
|
||||
#include <linux/scatterlist.h>
|
||||
|
||||
#include <asm/cacheflush.h>
|
||||
@@ -248,8 +249,15 @@ static inline dma_addr_t map_single(stru
|
||||
@@ -248,7 +249,13 @@ static inline dma_addr_t map_single(stru
|
||||
needs_bounce = (dma_addr | (dma_addr + size - 1)) & ~mask;
|
||||
}
|
||||
|
||||
@ -142,7 +142,13 @@
|
||||
+
|
||||
+ if (device_info && (needs_bounce || dma_needs_bounce_2(dev, dma_addr, size))) {
|
||||
struct safe_buffer *buf;
|
||||
+#endif
|
||||
|
||||
buf = alloc_safe_buffer(device_info, ptr, size, dir);
|
||||
if (buf == 0) {
|
||||
@@ -282,6 +289,7 @@ static inline dma_addr_t map_single(stru
|
||||
|
||||
return dma_addr;
|
||||
}
|
||||
+#endif
|
||||
|
||||
static inline void unmap_single(struct device *dev, dma_addr_t dma_addr,
|
||||
size_t size, enum dma_data_direction dir)
|
||||
|
Loading…
Reference in New Issue
Block a user