---

yaml --- r: 376047 b: refs/heads/master c: 642f2ec h: refs/heads/master i: 376045: 829d7c9 376043: 8cde99b 376039: 7dc425b 376031: 4ab5311 v: v3
git-mirror · May 17, 2013 · c466122 · c466122
1 parent 0ee5b3e
commit c466122
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91ec61f8f01cf32868e2ed2fa96a299e77964055
+refs/heads/master: 642f2ecc092f4d2d5a9b7219090531508017c324
diff --git a/trunk/drivers/staging/dwc2/platform.c b/trunk/drivers/staging/dwc2/platform.c
@@ -95,6 +95,14 @@ static int dwc2_driver_probe(struct platform_device *dev)
 
 	hsotg->dev = &dev->dev;
 
+	/*
+	 * Use reasonable defaults so platforms don't have to provide these.
+	 */
+	if (!dev->dev.dma_mask)
+		dev->dev.dma_mask = &dev->dev.coherent_dma_mask;
+	if (!dev->dev.coherent_dma_mask)
+		dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+
 	irq = platform_get_irq(dev, 0);
 	if (irq < 0) {
 		dev_err(&dev->dev, "missing IRQ resource\n");