From: Fabio Porcedda Date: Fri, 7 Sep 2012 13:27:42 +0000 (+0200) Subject: usb: gadget: at91_udc: fix dt support X-Git-Tag: v3.4.15~8 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7ec51fc74149ac5caafffce2b065e25ef621e2c1;p=karo-tx-linux.git usb: gadget: at91_udc: fix dt support commit 9c6d196d5aa35e07482f23c3e37755e7a82140e0 upstream. Don't fail the initialization check for the platform_data if there is avaiable an associated device tree node. Signed-off-by: Fabio Porcedda Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index 9d7bcd910074..be6952e2fc5a 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c @@ -1735,7 +1735,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;