---

yaml --- r: 358555 b: refs/heads/master c: 877e86f h: refs/heads/master i: 358553: 8aaf2d5 358551: 2d7bd23 v: v3
git-mirror · Feb 14, 2013 · ddaa300 · ddaa300
1 parent 60a9bc8
commit ddaa300
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a20702b8d7c2b54a618e203d94b37b4f1d21bbd4
+refs/heads/master: 877e86f28385407f05c5aa4e397d4ccb3233f01a
diff --git a/trunk/drivers/dma/dw_dmac.c b/trunk/drivers/dma/dw_dmac.c
@@ -1661,6 +1661,12 @@ static int dw_probe(struct platform_device *pdev)
 	if (!regs)
 		return -EBUSY;
 
+	/* Apply default dma_mask if needed */
+	if (!pdev->dev.dma_mask) {
+		pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
+		pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+	}
+
 	dw_params = dma_read_byaddr(regs, DW_PARAMS);
 	autocfg = dw_params >> DW_PARAMS_EN & 0x1;