diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-20 11:18:40 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-13 09:12:07 +0000 |
| commit | 1124d6d21f80ec10cc962e2961c21a8dd1e0ca6a (patch) | |
| tree | 0eb7f2bb830ed93daeb864cd554a00912356b3c4 /arch | |
| parent | 70d13e083c8589dd3edc2313777655da39cb3568 (diff) | |
| download | linux-3.10-1124d6d21f80ec10cc962e2961c21a8dd1e0ca6a.tar.gz linux-3.10-1124d6d21f80ec10cc962e2961c21a8dd1e0ca6a.tar.bz2 linux-3.10-1124d6d21f80ec10cc962e2961c21a8dd1e0ca6a.zip | |
[ARM] dma: correct dma_supported() implementation
dma_supported() is supposed to indicate whether the system can support
the DMA mask it was passed, which depends on the maximal address which
can be returned for DMA allocations. If the mask is smaller than that,
we are unable to guarantee that the driver can reliably obtain suitable
memory.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/dma-mapping.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index 4ed149cbb32..22cb14ec343 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/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) |