summaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/at91_udc.c
diff options
context:
space:
mode:
authorFabio Porcedda2012-09-07 15:27:42 +0200
committerFelipe Balbi2012-09-10 15:20:26 +0200
commit9c6d196d5aa35e07482f23c3e37755e7a82140e0 (patch)
treeb65b16054301550f1883b6bfe2b65273aa54d946 /drivers/usb/gadget/at91_udc.c
parentusb: gadget: at91_udc: move the dereference below the NULL test (diff)
downloadkernel-qcow2-linux-9c6d196d5aa35e07482f23c3e37755e7a82140e0.tar.gz
kernel-qcow2-linux-9c6d196d5aa35e07482f23c3e37755e7a82140e0.tar.xz
kernel-qcow2-linux-9c6d196d5aa35e07482f23c3e37755e7a82140e0.zip
usb: gadget: at91_udc: fix dt support
Don't fail the initialization check for the platform_data if there is avaiable an associated device tree node. Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/at91_udc.c')
-rw-r--r--drivers/usb/gadget/at91_udc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index d95f6b079345..af931282843d 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/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;