From 26fd6203bb304d620ff96d4a2581d04ee040acb2 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Wed, 10 Sep 2008 00:49:48 +0900 Subject: [PATCH] --- yaml --- r: 112584 b: refs/heads/master c: 982162602b31041b426edec6480d327743abcbcc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-x86/dma-mapping.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f1043cf9170f..bfef76867547 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a493d37f049b631e19584d1cb84cec88cbcf8fc +refs/heads/master: 982162602b31041b426edec6480d327743abcbcc diff --git a/trunk/include/asm-x86/dma-mapping.h b/trunk/include/asm-x86/dma-mapping.h index f43420b8c573..f408e6dd1778 100644 --- a/trunk/include/asm-x86/dma-mapping.h +++ b/trunk/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)