From b70df5a53b41b3f1d57b713771c2a4ea9b3babaa Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 20 Oct 2008 11:18:40 +0100 Subject: [PATCH] --- yaml --- r: 123693 b: refs/heads/master c: 1124d6d21f80ec10cc962e2961c21a8dd1e0ca6a h: refs/heads/master i: 123691: 6c6385c7d8d87bdb5891c58d81a2436da57d3783 v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/dma-mapping.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3a531cb9de87..15d54b365029 100644 --- 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 index 4ed149cbb32a..22cb14ec3438 100644 --- 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)