From eb89a57ae85aea573edfa2223cb0e5d495a41333 Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Fri, 7 Sep 2012 15:27:42 +0200
Subject: [PATCH] --- yaml --- r: 325929 b: refs/heads/master c:
 9c6d196d5aa35e07482f23c3e37755e7a82140e0 h: refs/heads/master i:   325927:
 5fd3e38ca75547e8ee2efbb6e869a02a1ce977c4 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/usb/gadget/at91_udc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ae86f01466d6..31a8fbe4388d 100644
--- 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
index d95f6b079345..af931282843d 100644
--- 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;