---

yaml --- r: 91041 b: refs/heads/master c: bb8ada9 h: refs/heads/master i: 91039: 20c1496 v: v3
git-mirror · Apr 19, 2008 · 02a8c14 · 02a8c14
1 parent b4718f0
commit 02a8c14
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da60cab4dd922cd933e82bace490f6155a32a90e
+refs/heads/master: bb8ada95a7c11adf3dad4e8d5c55ef1650560592
diff --git a/trunk/arch/x86/kernel/pci-dma_32.c b/trunk/arch/x86/kernel/pci-dma_32.c
@@ -91,6 +91,9 @@ void *dma_alloc_coherent(struct device *dev, size_t size,
 	if (dma_mask == 0)
 		dma_mask = DMA_32BIT_MASK;
 
+	if (dev->dma_mask == NULL)
+		return NULL;
+
 	/* Don't invoke OOM killer */
 	gfp |= __GFP_NORETRY;
 again: