linux/ixp4xx: fix an embracing mistake on commit r23150 (thank you KanjiMonster)

SVN-Revision: 23153
2010-09-29 15:09:07 +00:00 · 2010-09-29 15:09:07 +00:00 · d328e72247
parent ad41b53a74
commit d328e72247
1 changed files with 9 additions and 3 deletions
--- a/target/linux/ixp4xx/patches-2.6.36/050-disable_dmabounce.patch
+++ b/target/linux/ixp4xx/patches-2.6.36/050-disable_dmabounce.patch
@ -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)