---

yaml --- r: 325929 b: refs/heads/master c: 9c6d196 h: refs/heads/master i: 325927: 5fd3e38 v: v3
git-mirror · Sep 10, 2012 · eb89a57 · eb89a57
1 parent 0b8828b
commit eb89a57
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 162ca3ca613e02e115ec9c5273f94bd22dad0af2
+refs/heads/master: 9c6d196d5aa35e07482f23c3e37755e7a82140e0
diff --git a/trunk/drivers/usb/gadget/at91_udc.c b/trunk/drivers/usb/gadget/at91_udc.c
@@ -1704,7 +1704,7 @@ static int __devinit at91udc_probe(struct platform_device *pdev)
 	int		retval;
 	struct resource	*res;
 
-	if (!dev->platform_data) {
+	if (!dev->platform_data && !pdev->dev.of_node) {
 		/* small (so we copy it) but critical! */
 		DBG("missing platform_data\n");
 		return -ENODEV;