]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: gadget: at91_udc: fix dt support
authorFabio Porcedda <fabio.porcedda@gmail.com>
Fri, 7 Sep 2012 13:27:42 +0000 (15:27 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 21 Oct 2012 16:32:43 +0000 (09:32 -0700)
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 <fabio.porcedda@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/gadget/at91_udc.c

index 1e35963bd4edc29f735319a76e0a4eb7052b27f5..660fd53e28a5f3df6bbe92f74019f0692e7a358d 100644 (file)
@@ -1699,7 +1699,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;