diff --git a/[refs] b/[refs]
index 6ceb81115b26..636efe086f9c 100644
--- 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
index f134de3833a2..d2f70744a93a 100644
--- 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: