diff options
author | Fabio Porcedda <fabio.porcedda@gmail.com> | 2012-09-07 15:27:42 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-21 09:28:01 -0700 |
commit | 7ec51fc74149ac5caafffce2b065e25ef621e2c1 (patch) | |
tree | b409386c565a5fdec3cb26a961d53cc593d80d56 | |
parent | a5b9aa5533324fc9e3c2abe24ef335245473c331 (diff) | |
download | lwn-7ec51fc74149ac5caafffce2b065e25ef621e2c1.tar.gz lwn-7ec51fc74149ac5caafffce2b065e25ef621e2c1.zip |
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 <fabio.porcedda@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/gadget/at91_udc.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |