From: Chris Metcalf <cmetcalf@tilera.com>
Date: Mon, 5 Aug 2013 16:37:24 +0000 (-0400)
Subject: tile PCI DMA: handle a NULL dev argument properly
X-Git-Tag: firefly_0821_release~176^2~5408^2~69
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9b6846cede40cf12429d0fa06b3af0a0f40ae596;p=firefly-linux-kernel-4.4.55.git

tile PCI DMA: handle a NULL dev argument properly

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
---

diff --git a/arch/tile/kernel/pci-dma.c b/arch/tile/kernel/pci-dma.c
index 7e22e73264a9..adc369d8c77b 100644
--- a/arch/tile/kernel/pci-dma.c
+++ b/arch/tile/kernel/pci-dma.c
@@ -36,8 +36,9 @@ static void *tile_dma_alloc_coherent(struct device *dev, size_t size,
 				     dma_addr_t *dma_handle, gfp_t gfp,
 				     struct dma_attrs *attrs)
 {
-	u64 dma_mask = dev->coherent_dma_mask ?: DMA_BIT_MASK(32);
-	int node = dev_to_node(dev);
+	u64 dma_mask = (dev && dev->coherent_dma_mask) ?
+		dev->coherent_dma_mask : DMA_BIT_MASK(32);
+	int node = dev ? dev_to_node(dev) : 0;
 	int order = get_order(size);
 	struct page *pg;
 	dma_addr_t addr;