From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 9 Sep 2008 15:49:48 +0000 (+0900)
Subject: x86: convert dma_alloc_coherent to use is_device_dma_capable
X-Git-Tag: v2.6.28-rc1~712^2^4~45
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=982162602b31041b426edec6480d327743abcbcc;p=linux-2.6-omap-h63xx.git

x86: convert dma_alloc_coherent to use is_device_dma_capable

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h
index f43420b8c57..f408e6dd177 100644
--- a/include/asm-x86/dma-mapping.h
+++ b/include/asm-x86/dma-mapping.h
@@ -278,7 +278,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
 		gfp |= GFP_DMA;
 	}
 
-	if (!dev->dma_mask)
+	if (!is_device_dma_capable(dev))
 		return NULL;
 
 	if (!ops->alloc_coherent)