---

yaml --- r: 258175 b: refs/heads/master c: 3973c33 h: refs/heads/master i: 258173: 92d15b3 258171: e9d8f18 258167: 18bf96f 258159: 4a87c5b 258143: 28b4e8a 258111: c576178 258047: cc12fc2 v: v3
git-mirror · Jul 8, 2011 · b298378 · b298378
1 parent 5a22f28
commit b298378
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c8598fca1a359520623ed5409d23bb9e23d7da3
+refs/heads/master: 3973c337759cd201773a0ecc7b6f39f1ea2a6287
diff --git a/trunk/arch/arm/include/asm/dma-mapping.h b/trunk/arch/arm/include/asm/dma-mapping.h
@@ -133,18 +133,12 @@ static inline int dma_supported(struct device *dev, u64 mask)
 
 static inline int dma_set_mask(struct device *dev, u64 dma_mask)
 {
-#ifdef CONFIG_DMABOUNCE
-	if (dev->archdata.dmabounce) {
-		if (dma_mask >= ISA_DMA_THRESHOLD)
-			return 0;
-		else
-			return -EIO;
-	}
-#endif
 	if (!dev->dma_mask || !dma_supported(dev, dma_mask))
 		return -EIO;
 
+#ifndef CONFIG_DMABOUNCE
 	*dev->dma_mask = dma_mask;
+#endif
 
 	return 0;
 }