---

yaml --- r: 123693 b: refs/heads/master c: 1124d6d h: refs/heads/master i: 123691: 6c6385c v: v3
git-mirror · Dec 13, 2008 · b70df5a · b70df5a
1 parent 3b8c026
commit b70df5a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70d13e083c8589dd3edc2313777655da39cb3568
+refs/heads/master: 1124d6d21f80ec10cc962e2961c21a8dd1e0ca6a
diff --git a/trunk/arch/arm/include/asm/dma-mapping.h b/trunk/arch/arm/include/asm/dma-mapping.h
@@ -69,7 +69,9 @@ extern void dma_cache_maint(const void *kaddr, size_t size, int rw);
  */
 static inline int dma_supported(struct device *dev, u64 mask)
 {
-	return dev->dma_mask && *dev->dma_mask != 0;
+	if (mask < ISA_DMA_THRESHOLD)
+		return 0;
+	return 1;
 }
 
 static inline int dma_set_mask(struct device *dev, u64 dma_mask)