From: Rob Herring <rob.herring@calxeda.com>
Date: Wed, 30 Oct 2013 04:36:46 +0000 (-0500)
Subject: of: set dma_mask to point to coherent_dma_mask
X-Git-Tag: v3.13-rc1~117^2~10
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0589342c27944e50ebd7a54f5215002b6598b748;p=linux.git

of: set dma_mask to point to coherent_dma_mask

Platform devices created by DT code don't initialize dma_mask pointer to
anything. Set it to coherent_dma_mask by default if the architecture
code has not set it.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---

diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 9b439ac63d8e..c005495fa382 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -216,6 +216,8 @@ static struct platform_device *of_platform_device_create_pdata(
 	dev->archdata.dma_mask = 0xffffffffUL;
 #endif
 	dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+	if (!dev->dev.dma_mask)
+		dev->dev.dma_mask = &dev->dev.coherent_dma_mask;
 	dev->dev.bus = &platform_bus_type;
 	dev->dev.platform_data = platform_data;